Skip to content

Commit

Permalink
feat: Merge project/messaging (dvsa/olcs-selfserve#59)
Browse files Browse the repository at this point in the history
* feat: OLCS composer packages to dev-project/messaging (dvsa/olcs-selfserve#19)

* feat: Messaging conversation list (dvsa/olcs-selfserve#22)

* feat: Messaging conversation list

* fix: Missing route from branch re-create

* fix: Rename messages to conversations

* fix: Unused null check

* feat: Update olcs-comon lock

* feat: List messages in a conversation. (dvsa/olcs-selfserve#23)

* feat: Conversation messages list

* feat: Controller view test

* fix: Unused null check

* fix: Test PR changes (case and unused var)

* fix: Just added whitespace!

* feat: Messaging tab visibility (dvsa/olcs-selfserve#32)

* Update README.md

* WIP

* Tab WIP

* Messaging tab view based on feature toggle only

* Messaging tab logic without extra query

* Change routing to conversations

* Clean unused

* Review improvement

* Revert whitespace from bad resolution

---------

Co-authored-by: Joshua License <[email protected]>
Co-authored-by: Saul Wilcox <[email protected]>

* feat: Project branch change for composer.lock

* feat: Composer update due to common and transfer merges from main

* fix: Navigation unit test (dvsa/olcs-selfserve#36)

* Add messaging feature in NavigationTest

* fix: Add once() assertions to shouldReceive()

* Fix test to match CI error_reporting

* Formatting improvements

---------

Co-authored-by: Saul Wilcox <[email protected]>

* feat: Message list split in to two columns (dvsa/olcs-selfserve#41)

* feat: Message list split in to two columns

* feat: composer.lock

* feat: Start conversation link (dvsa/olcs-selfserve#45)

* feat: Start a new conversation link (and empty page)

* fix: PR: Rename newAction to addAction

* feat: Add header to new sidebar for start link (dvsa/olcs-selfserve#50)

* feat: Reply to conversation (dvsa/olcs-selfserve#49)

* feat: Reply to a conversation

* fix: Strong types on form

* feat: Messsaging new conversation form (dvsa/olcs-selfserve#53)

* chore: so far

* chore: so far

* chore: so far

* olcs-transfer bump

* feat: use GOVUK-SELECT class

* chore: code clean-up

* bump: olcs-common

* chore: bump olcs-common and olcs-transfer

* Add "Messaging not disabled" to tab display conditions (dvsa/olcs-selfserve#57)

* Add condition for messaging disabled for organisation

* Adjust to match call count

* Add full return to tests

* Whitespace

---------

Co-authored-by: Saul Wilcox <[email protected]>

* fix: Trying to access array key on null in navigation (dvsa/olcs-selfserve#60)

* fix: swapped container interface interop for Psr (dvsa/olcs-selfserve#62)

* chore: form annotation changes (dvsa/olcs-selfserve#63)

* chore: revert composer.json/lock to use non-messaging project branches (dvsa/olcs-selfserve#64)

---------

Co-authored-by: Wade Womersley <[email protected]>
Co-authored-by: Saul Wilcox <[email protected]>
Co-authored-by: Joshua License <[email protected]>
Co-authored-by: Saul Wilcox <[email protected]>
  • Loading branch information
5 people authored Feb 16, 2024
1 parent c648294 commit e0924c6
Show file tree
Hide file tree
Showing 25 changed files with 1,134 additions and 62 deletions.
24 changes: 12 additions & 12 deletions app/selfserve/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 61 additions & 17 deletions app/selfserve/module/Olcs/config/module.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Olcs\Controller\Factory\IndexControllerFactory;
use Olcs\Controller\Factory\MyDetailsControllerFactory;
use Olcs\Controller\IndexController;
use Common\Service\Data as CommonDataService;
use Olcs\Controller\Licence\Vehicle\ListVehicleController;
use Olcs\Controller\Lva\Adapters\ApplicationPeopleAdapter;
use Olcs\Controller\Lva\Adapters\LicencePeopleAdapter;
Expand Down Expand Up @@ -45,6 +46,7 @@
use Olcs\Logging\Log\Processor\CorrelationId;
use Olcs\Logging\Log\Processor\CorrelationIdFactory;
use Olcs\Service\Cookie as CookieService;
use Olcs\Service\Data as DataService;
use Olcs\Service\Processing as ProcessingService;
use Olcs\Service\Qa as QaService;
use Olcs\Session\LicenceVehicleManagement;
Expand Down Expand Up @@ -437,6 +439,37 @@
]
]
],
'conversations' => [
'type' => 'segment',
'options' => [
'route' => '/conversations[/]',
'defaults' => [
'controller' => Olcs\Controller\ConversationsController::class,
'action' => 'index'
]
],
'may_terminate' => true,
'child_routes' => [
'view' => [
'type' => 'segment',
'options' => [
'route' => ':conversationId[/]',
'defaults' => [
'action' => 'view',
],
]
],
'new' => [
'type' => 'segment',
'options' => [
'route' => 'new[/]',
'defaults' => [
'action' => 'add',
],
]
],
]
],
'create_variation' => [
'type' => 'segment',
'options' => [
Expand Down Expand Up @@ -1044,6 +1077,11 @@
'label' => 'dashboard-nav-documents',
'route' => 'correspondence',
),
array(
'id' => 'dashboard-messaging',
'label' => 'dashboard-nav-messaging',
'route' => 'conversations',
),
),
),
),
Expand Down Expand Up @@ -1301,25 +1339,26 @@
Olcs\Controller\Licence\Surrender\PrintSignReturnController::class => Olcs\Controller\Licence\Surrender\PrintSignReturnControllerFactory::class,
\Olcs\Controller\Licence\Surrender\InformationChangedController::class => \Olcs\Controller\Licence\Surrender\InformationChangedControllerFactory::class,
// Licence - Vehicles
\Olcs\Controller\Licence\Vehicle\AddVehicleSearchController::class => \Olcs\Controller\Licence\Vehicle\AddVehicleSearchControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\AddDuplicateVehicleController::class => \Olcs\Controller\Licence\Vehicle\AddDuplicateVehicleControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\RemoveVehicleController::class => \Olcs\Controller\Licence\Vehicle\RemoveVehicleControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\RemoveVehicleConfirmationController::class => \Olcs\Controller\Licence\Vehicle\RemoveVehicleConfirmationControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\TransferVehicleController::class => \Olcs\Controller\Licence\Vehicle\TransferVehicleControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\ViewVehicleController::class => \Olcs\Controller\Licence\Vehicle\ViewVehicleControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\TransferVehicleConfirmationController::class => \Olcs\Controller\Licence\Vehicle\TransferVehicleConfirmationControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscController::class => \Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\AddVehicleSearchController::class => \Olcs\Controller\Licence\Vehicle\AddVehicleSearchControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\AddDuplicateVehicleController::class => \Olcs\Controller\Licence\Vehicle\AddDuplicateVehicleControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\RemoveVehicleController::class => \Olcs\Controller\Licence\Vehicle\RemoveVehicleControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\RemoveVehicleConfirmationController::class => \Olcs\Controller\Licence\Vehicle\RemoveVehicleConfirmationControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\TransferVehicleController::class => \Olcs\Controller\Licence\Vehicle\TransferVehicleControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\ViewVehicleController::class => \Olcs\Controller\Licence\Vehicle\ViewVehicleControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\TransferVehicleConfirmationController::class => \Olcs\Controller\Licence\Vehicle\TransferVehicleConfirmationControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscController::class => \Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscControllerFactory::class,
\Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscConfirmationController::class => \Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscConfirmationControllerFactory::class,
PromptController::class => \Olcs\Controller\PromptControllerFactory::class,
Olcs\Controller\ConversationsController::class => Olcs\Controller\Factory\ConversationsControllerFactory::class,
PromptController::class => \Olcs\Controller\PromptControllerFactory::class,
// Process Signature from GOV.UK Account
\Olcs\Controller\SignatureVerificationController::class => \Olcs\Controller\SignatureVerificationControllerFactory::class,
\Olcs\Controller\SignatureVerificationController::class => \Olcs\Controller\SignatureVerificationControllerFactory::class,
// LVA Controller Factories
LvaLicenceControllers\AddressesController::class => LvaLicenceControllerFactories\AddressesControllerFactory::class,
LvaLicenceControllers\BusinessDetailsController::class => LvaLicenceControllerFactories\BusinessDetailsControllerFactory::class,
LvaLicenceControllers\BusinessTypeController::class => LvaLicenceControllerFactories\BusinessTypeControllerFactory::class,
LvaLicenceControllers\ConditionsUndertakingsController::class => LvaLicenceControllerFactories\ConditionsUndertakingsControllerFactory::class,
LvaLicenceControllers\DiscsController::class => LvaLicenceControllerFactories\DiscsControllerFactory::class,
LvaLicenceControllers\OperatingCentresController::class => LvaLicenceControllerFactories\OperatingCentresControllerFactory::class,
LvaLicenceControllers\AddressesController::class => LvaLicenceControllerFactories\AddressesControllerFactory::class,
LvaLicenceControllers\BusinessDetailsController::class => LvaLicenceControllerFactories\BusinessDetailsControllerFactory::class,
LvaLicenceControllers\BusinessTypeController::class => LvaLicenceControllerFactories\BusinessTypeControllerFactory::class,
LvaLicenceControllers\ConditionsUndertakingsController::class => LvaLicenceControllerFactories\ConditionsUndertakingsControllerFactory::class,
LvaLicenceControllers\DiscsController::class => LvaLicenceControllerFactories\DiscsControllerFactory::class,
LvaLicenceControllers\OperatingCentresController::class => LvaLicenceControllerFactories\OperatingCentresControllerFactory::class,
LvaLicenceControllers\OverviewController::class => LvaLicenceControllerFactories\OverviewControllerFactory::class,
LvaLicenceControllers\PeopleController::class => LvaLicenceControllerFactories\PeopleControllerFactory::class,
LvaLicenceControllers\SafetyController::class => LvaLicenceControllerFactories\SafetyControllerFactory::class,
Expand Down Expand Up @@ -1425,7 +1464,7 @@
VariationTransportManagerAdapter::class => VariationTransportManagerAdapterFactory::class,
VariationPeopleAdapter::class => VariationPeopleAdapterFactory::class,
\Olcs\Logging\Log\Processor\CorrelationId::class => \Olcs\Logging\Log\Processor\CorrelationIdFactory::class,
]
],
),
'log_processors' => [
'factories' => [
Expand Down Expand Up @@ -1467,6 +1506,11 @@
'simple_date_format' => array(
'default' => 'd-m-Y'
),
'data_services' => [
'factories' => [
DataService\MessagingAppOrLicNo::class => CommonDataService\AbstractListDataServiceFactory::class,
],
],
'view_helpers' => array(
'factories' => [
\Olcs\View\Helper\SessionTimeoutWarning\SessionTimeoutWarning::class => \Olcs\View\Helper\SessionTimeoutWarning\SessionTimeoutWarningFactory::class,
Expand Down
Loading

0 comments on commit e0924c6

Please sign in to comment.