@hmcts/ccd-case-ui-toolkit 4.9.3-state-machine → 4.9.6-state-machine

package/RELEASE-NOTES.md

@@ -1,6 +1,6 @@
 ## RELEASE NOTES
 
-### Version 4.9.3-state-machine
+### Version 4.9.6-state-machine
 **Task event completion and state machine** Task event completion and state machine
 
 ### Version 4.3.6-hotfix-EUI-4404

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.9.3-state-machine
+ * @version v4.9.6-state-machine
  * @link undefined
  * @license MIT
  */
@@ -19311,6 +19311,16 @@ exports.viewerRouting = [
         canActivate: [event_start_guard_1.EventStartGuard],
         canDeactivate: [file_upload_progress_guard_1.FileUploadProgressGuard],
     },
+    {
+        path: 'trigger/:eid/task/:tid',
+        resolve: {
+            eventTrigger: services_1.EventTriggerResolver,
+        },
+        component: case_event_trigger_1.CaseEventTriggerComponent,
+        children: case_editor_1.editorRouting,
+        canActivate: [event_start_guard_1.EventStartGuard],
+        canDeactivate: [file_upload_progress_guard_1.FileUploadProgressGuard],
+    },
     {
         path: 'event-start',
         component: event_management_1.EventStartComponent,
@@ -20498,16 +20508,17 @@ var EventStartGuard = /** @class */ (function () {
         var _this = this;
         var caseId = route.params['cid'];
         var eventId = route.params['eid'];
+        var taskId = route.params['tid'];
         // TODO: NavigationExtras should be used once Angular upgrade changes have been incorporated
         var isComplete = route.queryParams['isComplete'];
         if (isComplete) {
             return rxjs_1.of(true);
         }
-        return this.workAllocationService.getTasksByCaseIdAndEventId(eventId, caseId).pipe(operators_1.switchMap(function (payload) { return _this.checkForTasks(payload, caseId, eventId); }));
+        return this.workAllocationService.getTasksByCaseIdAndEventId(eventId, caseId).pipe(operators_1.switchMap(function (payload) { return _this.checkForTasks(payload, caseId, eventId, taskId); }));
     };
-    EventStartGuard.prototype.checkForTasks = function (payload, caseId, eventId) {
+    EventStartGuard.prototype.checkForTasks = function (payload, caseId, eventId, taskId) {
         if (payload.task_required_for_event) {
-            this.router.navigate(["/cases/case-details/" + caseId + "/event-start"], { queryParams: { caseId: caseId, eventId: eventId } });
+            this.router.navigate(["/cases/case-details/" + caseId + "/event-start"], { queryParams: { caseId: caseId, eventId: eventId, taskId: taskId } });
             return rxjs_1.of(false);
         }
         return rxjs_1.of(true);
@@ -20625,11 +20636,13 @@ var EventStartComponent = /** @class */ (function () {
         var tasks = this.route.snapshot.data.tasks;
         var caseId = this.route.snapshot.data.case.case_id;
         var eventId = this.route.snapshot.queryParams['eventId'];
+        var taskId = this.route.snapshot.queryParams['taskId'];
         // Setup the context
         this.context = {
             tasks: tasks,
             caseId: caseId,
             eventId: eventId,
+            taskId: taskId,
             router: this.router,
             route: this.route,
             sessionStorageService: this.sessionStorageService
@@ -20938,19 +20951,28 @@ var EventStateMachineService = /** @class */ (function () {
         var userInfoStr = context.sessionStorageService.getItem('userDetails');
         var userInfo = JSON.parse(userInfoStr);
         var tasksAssignedToUser = context.tasks.filter(function (x) { return x.assignee === userInfo.id || x.assignee === userInfo.uid; });
-        switch (tasksAssignedToUser.length) {
-            case 0:
-                // No tasks assigned to user, trigger state task unassigned
-                state.trigger(models_1.EventStates.TASK_UNASSIGNED);
-                break;
-            case 1:
-                // One task assigned to user
-                state.trigger(models_1.EventStates.ONE_TASK_ASSIGNED_TO_USER);
-                break;
-            default:
-                // Multiple tasks assigned to user, trigger state multiple tasks assigned to user
-                state.trigger(models_1.EventStates.MULTIPLE_TASKS_ASSIGNED_TO_USER);
-                break;
+        // Check if user initiated the event from task tab
+        var isEventInitiatedFromTaskTab = context.taskId !== undefined && tasksAssignedToUser.findIndex(function (x) { return x.id === context.taskId; }) > -1;
+        if (isEventInitiatedFromTaskTab) {
+            // User initiated event from task tab
+            state.trigger(models_1.EventStates.ONE_TASK_ASSIGNED_TO_USER);
+        }
+        else {
+            // User initiated event from dropdown
+            switch (tasksAssignedToUser.length) {
+                case 0:
+                    // No tasks assigned to user, trigger state task unassigned
+                    state.trigger(models_1.EventStates.TASK_UNASSIGNED);
+                    break;
+                case 1:
+                    // One task assigned to user
+                    state.trigger(models_1.EventStates.ONE_TASK_ASSIGNED_TO_USER);
+                    break;
+                default:
+                    // Multiple tasks assigned to user, trigger state multiple tasks assigned to user
+                    state.trigger(models_1.EventStates.MULTIPLE_TASKS_ASSIGNED_TO_USER);
+                    break;
+            }
         }
     };
     EventStateMachineService.prototype.entryActionForStateTaskUnAssigned = function (state, context) {
@@ -20973,6 +20995,13 @@ var EventStateMachineService = /** @class */ (function () {
     EventStateMachineService.prototype.entryActionForStateOneTaskAssignedToUser = function (state, context) {
         // Trigger final state to complete processing of state machine
         state.trigger(models_1.StateMachineStates.FINAL);
+        // Get task assigned to user
+        var task = context.tasks.find(function (x) { return x.id === context.taskId; });
+        if (!task) {
+            task = context.tasks[0];
+        }
+        // Store task to session
+        context.sessionStorageService.setItem('taskToComplete', JSON.stringify(task));
         // Allow user to perform the event
         context.router.navigate(["/cases/case-details/" + context.caseId + "/trigger/" + context.eventId], { queryParams: { isComplete: true }, relativeTo: context.route });
     };
@@ -83552,7 +83581,7 @@ module.exports = "<div class=\"govuk-!-margin-9\">\n  <div class=\"govuk-error-s
 /***/ 50744:
 /***/ ((module) => {
 
-module.exports = "<div class=\"govuk-!-margin-9\">\n  <div class=\"govuk-error-summary\" aria-labelledby=\"error-summary-title\" role=\"alert\" tabindex=\"-1\" data-module=\"error-summary\">\n    <h2 class=\"govuk-error-summary__title\" id=\"error-summary-title\">\n      There is a problem\n    </h2>\n    <div class=\"govuk-error-summary__body\">\n      <ul class=\"govuk-list govuk-error-summary__list\">\n        <li>\n          <a href=\"#\">Task assignment required</a>\n        </li>\n      </ul>\n    </div>\n  </div>\n\n  <div class=\"govuk-form-group govuk-form-group--error\">\n      <h2 class=\"govuk-heading-m\">Task assignment required</h2>\n\n    <p>This task is assigned to {{assignedUserName}}. You must assigned it to yourself to continue.</p>\n\n    <a href=\"javascript:void(0)\" [routerLink]=\"['/', 'cases', 'case-details', caseId, 'tasks']\">Return to tasks tab</a>\n  </div>\n</div>\n"
+module.exports = "<div class=\"govuk-!-margin-9\">\n  <div class=\"govuk-error-summary\" aria-labelledby=\"error-summary-title\" role=\"alert\" tabindex=\"-1\" data-module=\"error-summary\">\n    <h2 class=\"govuk-error-summary__title\" id=\"error-summary-title\">\n      There is a problem\n    </h2>\n    <div class=\"govuk-error-summary__body\">\n      <ul class=\"govuk-list govuk-error-summary__list\">\n        <li>\n          <a href=\"#\">Task assignment required</a>\n        </li>\n      </ul>\n    </div>\n  </div>\n\n  <div class=\"govuk-form-group govuk-form-group--error\">\n      <h2 class=\"govuk-heading-m\">Task assignment required</h2>\n\n    <p>This task is assigned to {{assignedUserName}}. You must assign it to yourself to continue.</p>\n\n    <a href=\"javascript:void(0)\" [routerLink]=\"['/', 'cases', 'case-details', caseId, 'tasks']\">Return to tasks tab</a>\n  </div>\n</div>\n"
 
 /***/ }),