feat: Merge project/messaging (dvsa/olcs-internal#87)

* feat: OLCS packages to dev-project/messaging (dvsa/olcs-internal#24)

* feat: Internal messaging - Reply to a message - MVP (dvsa/olcs-internal#18)

* feat: Conversation Reply. Form complete with post to non functional BE.

* feat: Dispatch reply to BE. Hide attachment.

* feat: .phpstorm.meta.php for ocls-internal

* fix: Alias Create for readability

* fix: Remove strong type from close factory (dvsa/olcs-internal#25)

* fix: On successful message reply, clear the textarea (dvsa/olcs-internal#33)

* feat: Composer update for transfer/common after main merge

* fix: After replying to a conversation, redirect to prevent re-submit (dvsa/olcs-internal#41)

* fix: After replying to a conversation, redirect to prevent re-submit

* feat: Add flash message

* feat: Messaging user level disable/enable (dvsa/olcs-internal#37)

* feat: Disable/enabling messaging

* feat: Show/hide menu disable/enable commands.

fix: Messaging around enable/disable

* fix: Side navigation to work for all conversation section

* fix: RouteParam added for all conversation controllers

* feat: Unit tests for cotroller and route param

* feat: Bump olcs-transfer

* fix: Non local white screens when using strong types for the container (dvsa/olcs-internal#45)

* fix: Non local white screens when using strong types for the container (tests) (dvsa/olcs-internal#47)

* feat: Update messaging disable text for new AC. (dvsa/olcs-internal#48)

* feat: Create Conversation form & template (dvsa/olcs-internal#6)

* First Commit of form

* Changed route to get add action

* Organisation form list service

* Added connection to query

* modified category

* Added organisatin and drop down sub category

* added new controller form alter fn, removed organisation

* removed broken query

* Add usage of ByLicenceToOrganisation for licence list

* Review suggestions

* Remove extra case; Whitespace edits

* Choose query based on param presence

* Abstract & split controller

* Review comments and housekeeping

* Remove unused code for tweaking route match

* Remove asserts; Whitespace

* fix: Remove strong type from close factory

* Fix inconsistent label

* Renaming

* Add data service and use in form

* Update transfer

* wip: so far

* fix: introduced redirect by mistake for localtest

* fix: reverted EnvironmentComplaintController to main

* fix: remove dd

* Redirection config

* Whitespace

* Remove unused from config

* Use licence id from response to redirect

* Bump transfer & common

* Review suggestions

---------

Co-authored-by: Jamie_gordon_1 <[email protected]>
Co-authored-by: Saul Wilcox <[email protected]>
Co-authored-by: wadedvsa <[email protected]>
Co-authored-by: James Wragg <[email protected]>

* fix: Listeners for Create Conversation controllers (dvsa/olcs-internal#58)

* Fix config to use listeners

* Remove old class

---------

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

* fix: Add horizontal navgation to enable/disable messaging page (dvsa/olcs-internal#72)

* feat: Task messaging filter (home page) (dvsa/olcs-internal#76)

* feat: Task messaging filter (home page)

* feat: olcs-transfer composer bump

* chore: removed DataService and use one in common

* Revert "chore: removed DataService and use one in common"

This reverts commit 12898f1a8d72d96f1cb448e0d0bbd1da45e8908b.

* chore: moved dataservice for applicno to common (dvsa/olcs-internal#80)

* chore: removed DataService and use one in common

* bump: olcs-common

* chore: bump olcs-common and olcs-transfer

* feat: Extend messaging to applications (dvsa/olcs-internal#81)

* feat: Extend support of messaging to application nav

* feat: Extend support of messaging to application nav

* feat: Strong type aliases

* fix: Cleaner controller code

* fix: declare strict_types

* Revert "fix: Cleaner controller code"

This reverts commit 7650b454036e4c1f2c1badae5b416434c5b82270.

* fix: PR change to thrown exception

* feat: Bump olcs-common

* fix: Update route param test for application routes (dvsa/olcs-internal#83)

* fix: Add missing licence (and application) headers to a few messaging pages (dvsa/olcs-internal#85)

* fix: interop > psr for container and removal of createService for factories (dvsa/olcs-internal#89)

* fix: remove createService and interop for ApplicationCreateConversationControllerFactory

* fix: removed interop container interface for LicenceCreateConversationControllerFactory and cleanup

* fix: swap interop for psr for container in LicenceEnableDisableMessagingControllerFactory

* fix: swap interop for psr for container in RouteParam/Conversation

* fix: swap interop for psr for container in RouteParam/ConversationTest & cleanup imports

* fix: swap interop for psr for container in ApplicationCloseConversationControllerFactory

* fix: swap interop for psr for container in ApplicationConversationListControllerFactory

* fix: swap interop for psr for container in ApplicationConversationMessagesControllerFactory

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

* chore: form annotation changes (dvsa/olcs-internal#91)

---------

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

app/internal/.phpstorm.meta.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace PHPSTORM_META {
+    override(
+        \Olcs\Controller\AbstractInternalController::getForm(0),
+        map([
+            '' => '\Common\Form\Form'
+        ])
+    );
+}

app/internal/module/Olcs/assets/js/inline/forms/message-categories.js

@@ -0,0 +1,12 @@
+OLCS.ready(function() {
+  "use strict";
+
+  var form = "form[name=NewMessage]";
+
+  OLCS.cascadeInput({
+    source: form + " #category",
+    dest: form + " #subCategory",
+    url: "/list/task-sub-categories",
+    emptyLabel: "Please select"
+  });
+});

app/internal/module/Olcs/config/module.config.php

@@ -11,9 +11,10 @@
 use Common\Data\Object\Search\Publication;
 use Common\Data\Object\Search\User;
 use Common\Data\Object\Search\Vehicle;
-use Common\Form\Elements\Validators\TableRequiredValidator;
 use Common\Service\Data as CommonDataService;
 use Laminas\Cache\Service\StorageCacheAbstractServiceFactory;
+use Laminas\Http\Request;
+use Laminas\Router\RouteStackInterface;
 use Olcs\Auth;
 use Olcs\Controller\Application as ApplicationControllers;
 use Olcs\Controller\Application\ApplicationController;
@@ -42,6 +43,7 @@
 use Olcs\Controller\Factory\SearchControllerFactory;
 use Olcs\Controller\Factory\SplitScreenControllerFactory;
 use Olcs\Controller\Factory\TaskControllerFactory;
+use Olcs\Controller\Factory\TransportManager as TransportManagerControllerFactories;
 use Olcs\Controller\Factory\TransportManager\Details\TransportManagerDetailsPreviousHistoryControllerFactory;
 use Olcs\Controller\Factory\TransportManager\Processing\TransportManagerProcessingTaskControllerFactory;
 use Olcs\Controller\Factory\TransportManager\TransportManagerDocumentControllerFactory;
@@ -68,6 +70,14 @@
 use Olcs\Controller\Lva\Factory\Controller\Variation as LvaVariationControllerFactories;
 use Olcs\Controller\Lva\Licence as LvaLicenceControllers;
 use Olcs\Controller\Lva\Variation as LvaVariationControllers;
+use Olcs\Controller\Messages\ApplicationConversationListController;
+use Olcs\Controller\Messages\ApplicationCreateConversationController;
+use Olcs\Controller\Messages\ApplicationConversationMessagesController;
+use Olcs\Controller\Messages\ApplicationEnableDisableMessagingController;
+use Olcs\Controller\Messages\LicenceConversationListController;
+use Olcs\Controller\Messages\LicenceConversationMessagesController;
+use Olcs\Controller\Messages\LicenceCreateConversationController;
+use Olcs\Controller\Messages\LicenceEnableDisableMessagingController;
 use Olcs\Controller\Operator as OperatorControllers;
 use Olcs\Controller\Operator\HistoryController;
 use Olcs\Controller\Operator\OperatorBusinessDetailsController;
@@ -76,6 +86,7 @@
 use Olcs\Controller\Sla\LicenceDocumentSlaTargetDateController;
 use Olcs\Controller\TaskController;
 use Olcs\Controller\TransportManager as TmCntr;
+use Olcs\Controller\TransportManager as TransportManagerControllers;
 use Olcs\Controller\TransportManager\Details\TransportManagerDetailsDetailController;
 use Olcs\Controller\TransportManager\Details\TransportManagerDetailsDetailControllerFactory;
 use Olcs\Controller\TransportManager\Details\TransportManagerDetailsPreviousHistoryController;
@@ -120,8 +131,6 @@
 use Olcs\View\Helper\SlaIndicator;
 use Olcs\View\Helper\SubmissionSectionMultipleTablesFactory;
 use Olcs\View\Helper\SubmissionSectionTableFactory;
-use Olcs\Controller\TransportManager as TransportManagerControllers;
-use Olcs\Controller\Factory\TransportManager as TransportManagerControllerFactories;
 
 return array(
     'router' => [
@@ -291,27 +300,31 @@
             LvaVariationControllers\SafetyController::class => LvaVariationControllerFactories\SafetyControllerFactory::class,
             LvaVariationControllers\SubmitController::class => LvaVariationControllerFactories\SubmitControllerFactory::class,
             LvaVariationControllers\TaxiPhvController::class => LvaVariationControllerFactories\TaxiPhvControllerFactory::class,
-            LvaVariationControllers\TransportManagersController::class => LvaVariationControllerFactories\TransportManagersControllerFactory::class,
-            LvaVariationControllers\TypeOfLicenceController::class => LvaVariationControllerFactories\TypeOfLicenceControllerFactory::class,
-            LvaVariationControllers\VehiclesController::class => LvaVariationControllerFactories\VehiclesControllerFactory::class,
-            LvaVariationControllers\VehiclesDeclarationsController::class => LvaVariationControllerFactories\VehiclesDeclarationsControllerFactory::class,
-            LvaVariationControllers\VehiclesPsvController::class => LvaVariationControllerFactories\VehiclesPsvControllerFactory::class,
-            LvaVariationControllers\WithdrawController::class => LvaVariationControllerFactories\WithdrawControllerFactory::class,
-            Olcs\Controller\IndexController::class => Olcs\Controller\Factory\IndexControllerFactory::class,
-            Olcs\Controller\Messages\LicenceConversationMessagesController::class => Olcs\Controller\Factory\Messages\LicenceConversationMessagesControllerFactory::class,
-            Olcs\Controller\Messages\ApplicationConversationListController::class => Olcs\Controller\Factory\Messages\ApplicationConversationListControllerFactory::class,
-            Olcs\Controller\Messages\LicenceConversationListController::class=> Olcs\Controller\Factory\Messages\LicenceConversationListControllerFactory::class,
-            Olcs\Controller\Messages\LicenceDisableConversationListController::class=> Olcs\Controller\Factory\Messages\LicenceDisableConversationListControllerFactory::class,
-            Olcs\Controller\Messages\LicenceNewConversationController::class=> Olcs\Controller\Factory\Messages\LicenceNewConversationControllerFactory::class,
-            Olcs\Controller\Messages\LicenceCloseConversationController::class => Olcs\Controller\Factory\Messages\LicenceCloseConversationControllerFactory::class,
-            OperatorControllers\OperatorFeesController::class => OperatorControllerFactories\OperatorFeesControllerFactory::class,
-            OperatorControllers\OperatorProcessingTasksController::class => OperatorControllerFactories\OperatorProcessingTasksControllerFactory::class,
-            OperatorControllers\UnlicensedBusinessDetailsController::class => OperatorControllerFactories\UnlicensedBusinessDetailsControllerFactory::class,
-            OperatorControllers\HistoryController::class => OperatorControllerFactories\HistoryControllerFactory::class,
-            OperatorControllers\Cases\UnlicensedCasesOperatorController::class => OperatorControllerFactories\Cases\UnlicensedCasesOperatorControllerFactory::class,
-            OperatorControllers\Docs\OperatorDocsController::class => OperatorControllerFactories\Docs\OperatorDocsControllerFactory::class,
-            OperatorControllers\OperatorController::class => OperatorControllerFactories\OperatorControllerFactory::class,
-            ApplicationControllers\ApplicationController::class => ApplicationControllerFactories\ApplicationControllerFactory::class,
+            LvaVariationControllers\TransportManagersController::class              => LvaVariationControllerFactories\TransportManagersControllerFactory::class,
+            LvaVariationControllers\TypeOfLicenceController::class                  => LvaVariationControllerFactories\TypeOfLicenceControllerFactory::class,
+            LvaVariationControllers\VehiclesController::class                       => LvaVariationControllerFactories\VehiclesControllerFactory::class,
+            LvaVariationControllers\VehiclesDeclarationsController::class           => LvaVariationControllerFactories\VehiclesDeclarationsControllerFactory::class,
+            LvaVariationControllers\VehiclesPsvController::class                    => LvaVariationControllerFactories\VehiclesPsvControllerFactory::class,
+            LvaVariationControllers\WithdrawController::class                       => LvaVariationControllerFactories\WithdrawControllerFactory::class,
+            Olcs\Controller\IndexController::class                                  => Olcs\Controller\Factory\IndexControllerFactory::class,
+            Olcs\Controller\Messages\ApplicationConversationMessagesController::class => Olcs\Controller\Factory\Messages\ApplicationConversationMessagesControllerFactory::class,
+            Olcs\Controller\Messages\LicenceConversationMessagesController::class   => Olcs\Controller\Factory\Messages\LicenceConversationMessagesControllerFactory::class,
+            Olcs\Controller\Messages\ApplicationConversationListController::class   => Olcs\Controller\Factory\Messages\ApplicationConversationListControllerFactory::class,
+            Olcs\Controller\Messages\LicenceConversationListController::class       => Olcs\Controller\Factory\Messages\LicenceConversationListControllerFactory::class,
+            Olcs\Controller\Messages\ApplicationEnableDisableMessagingController::class => Olcs\Controller\Factory\Messages\ApplicationEnableDisableMessagingControllerFactory::class,
+            Olcs\Controller\Messages\LicenceEnableDisableMessagingController::class => Olcs\Controller\Factory\Messages\LicenceEnableDisableMessagingControllerFactory::class,
+            Olcs\Controller\Messages\ApplicationCreateConversationController::class => Olcs\Controller\Factory\Messages\ApplicationCreateConversationControllerFactory::class,
+            Olcs\Controller\Messages\LicenceCreateConversationController::class     => Olcs\Controller\Factory\Messages\LicenceCreateConversationControllerFactory::class,
+            Olcs\Controller\Messages\ApplicationCloseConversationController::class  => Olcs\Controller\Factory\Messages\ApplicationCloseConversationControllerFactory::class,
+            Olcs\Controller\Messages\LicenceCloseConversationController::class      => Olcs\Controller\Factory\Messages\LicenceCloseConversationControllerFactory::class,
+            OperatorControllers\OperatorFeesController::class                       => OperatorControllerFactories\OperatorFeesControllerFactory::class,
+            OperatorControllers\OperatorProcessingTasksController::class            => OperatorControllerFactories\OperatorProcessingTasksControllerFactory::class,
+            OperatorControllers\UnlicensedBusinessDetailsController::class          => OperatorControllerFactories\UnlicensedBusinessDetailsControllerFactory::class,
+            OperatorControllers\HistoryController::class                            => OperatorControllerFactories\HistoryControllerFactory::class,
+            OperatorControllers\Cases\UnlicensedCasesOperatorController::class      => OperatorControllerFactories\Cases\UnlicensedCasesOperatorControllerFactory::class,
+            OperatorControllers\Docs\OperatorDocsController::class                  => OperatorControllerFactories\Docs\OperatorDocsControllerFactory::class,
+            OperatorControllers\OperatorController::class                           => OperatorControllerFactories\OperatorControllerFactory::class,
+            ApplicationControllers\ApplicationController::class                     => ApplicationControllerFactories\ApplicationControllerFactory::class,
             ApplicationControllers\Docs\ApplicationDocsController::class => ApplicationControllerFactories\Docs\ApplicationDocsControllerFactory::class,
             ApplicationControllers\Fees\ApplicationFeesController::class => ApplicationControllerFactories\Fees\ApplicationFeesControllerFactory::class,
             ApplicationControllers\Processing\ApplicationProcessingOverviewController::class => ApplicationControllerFactories\Processing\ApplicationProcessingOverviewControllerFactory::class,
@@ -674,7 +687,9 @@
             'Helper\ApplicationOverview' => HelperService\ApplicationOverviewHelperService::class,
             'Helper\LicenceOverview' => HelperService\LicenceOverviewHelperService::class,
             'Processing\CreateVariation' => ProcessingService\CreateVariationProcessingServiceFactory::class,
-            'LicenceListener' => LicenceListener::class
+            'LicenceListener' => LicenceListener::class,
+            RouteStackInterface::class => 'Router',
+            Request::class             => 'Request',
         ],
         'invokables' => [
             'ApplicationUtility' => 'Olcs\Service\Utility\ApplicationUtility',
@@ -708,20 +723,21 @@
             ApplicationFurniture::class => ApplicationFurniture::class,
             LicenceFurniture::class => LicenceFurniture::class,
             OrganisationFurniture::class => OrganisationFurniture::class,
-            VariationFurniture::class => VariationFurniture::class,
-            BusRegFurniture::class => BusRegFurniture::class,
-            CasesFurniture::class => CasesFurniture::class,
-            SubmissionsFurniture::class => SubmissionsFurniture::class,
-            TransportManagerFurniture::class => TransportManagerFurniture::class,
-            IrhpApplicationFurniture::class => IrhpApplicationFurniture::class,
-            Olcs\Listener\RouteParam\Cases::class => Olcs\Listener\RouteParam\Cases::class,
-            'Olcs\Listener\RouteParam\CaseMarker' => 'Olcs\Listener\RouteParam\CaseMarker',
-            RouteParam\Organisation::class => RouteParam\Organisation::class,
-            'Olcs\Navigation\RightHandNavigation' => 'Olcs\Navigation\RightHandNavigationFactory',
-            HeaderSearch::class => HeaderSearch::class,
+            VariationFurniture::class                                      => VariationFurniture::class,
+            BusRegFurniture::class                                         => BusRegFurniture::class,
+            CasesFurniture::class                                          => CasesFurniture::class,
+            SubmissionsFurniture::class                                    => SubmissionsFurniture::class,
+            TransportManagerFurniture::class                               => TransportManagerFurniture::class,
+            IrhpApplicationFurniture::class                                => IrhpApplicationFurniture::class,
+            Olcs\Listener\RouteParam\Cases::class                          => Olcs\Listener\RouteParam\Cases::class,
+            'Olcs\Listener\RouteParam\CaseMarker'                          => 'Olcs\Listener\RouteParam\CaseMarker',
+            RouteParam\Organisation::class                                 => RouteParam\Organisation::class,
+            RouteParam\Conversation::class                                 => RouteParam\Conversation::class,
+            'Olcs\Navigation\RightHandNavigation'                          => 'Olcs\Navigation\RightHandNavigationFactory',
+            HeaderSearch::class                                            => HeaderSearch::class,
             Olcs\Data\Mapper\BilateralApplicationValidationModifier::class =>
                 Olcs\Data\Mapper\BilateralApplicationValidationModifierFactory::class,
-            Olcs\Data\Mapper\IrhpApplication::class =>
+            Olcs\Data\Mapper\IrhpApplication::class                        =>
                 Olcs\Data\Mapper\IrhpApplicationFactory::class,
 
             Olcs\Service\Permits\Bilateral\ApplicationFormPopulator::class =>
@@ -829,6 +845,30 @@
             RouteParam\LicenceFurniture::class,
             RouteParam\Licence::class,
         ],
+        ApplicationEnableDisableMessagingController::class => [
+            RouteParam\Conversation::class,
+        ],
+        LicenceEnableDisableMessagingController::class => [
+            RouteParam\Conversation::class,
+        ],
+        ApplicationConversationListController::class => [
+            RouteParam\Conversation::class,
+        ],
+        LicenceConversationListController::class => [
+            RouteParam\Conversation::class,
+        ],
+        LicenceConversationMessagesController::class => [
+            RouteParam\Conversation::class,
+        ],
+        ApplicationConversationMessagesController::class => [
+            RouteParam\Conversation::class,
+        ],
+        LicenceCreateConversationController::class => [
+            RouteParam\Conversation::class,
+        ],
+        ApplicationCreateConversationController::class => [
+            RouteParam\Conversation::class,
+        ],
     ],
     'search' => [
         'invokables' => [