@hmcts/ccd-case-ui-toolkit 4.9.12-state-machine → 4.9.13-state-machine

package/RELEASE-NOTES.md

@@ -1,6 +1,6 @@
 ## RELEASE NOTES
 
-### Version 4.9.12-state-machine"
+### Version 4.9.13-state-machine"
 **Task event completion and state machine** Task event completion and state machine
 
 ### Version 4.7.6-tab-not-defined-error"

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.9.12-state-machine
+ * @version v4.9.13-state-machine
  * @link undefined
  * @license MIT
  */
@@ -15364,13 +15364,11 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 var core_1 = __webpack_require__(57208);
-var router_1 = __webpack_require__(92302);
 var case_event_completion_component_1 = __webpack_require__(9349);
 var CaseEventCompletionTaskCancelledComponent = /** @class */ (function () {
-    function CaseEventCompletionTaskCancelledComponent(parentComponent, route) {
+    function CaseEventCompletionTaskCancelledComponent(parentComponent) {
         this.parentComponent = parentComponent;
-        this.route = route;
-        this.caseId = this.route.snapshot.params['cid'];
+        this.caseId = this.parentComponent.context.caseId;
     }
     CaseEventCompletionTaskCancelledComponent.prototype.onContinue = function () {
         // Emit event can be completed event
@@ -15382,8 +15380,7 @@ var CaseEventCompletionTaskCancelledComponent = /** @class */ (function () {
             template: __webpack_require__(69675)
         }),
         __param(0, core_1.Inject(case_event_completion_component_1.COMPONENT_PORTAL_INJECTION_TOKEN)),
-        __metadata("design:paramtypes", [case_event_completion_component_1.CaseEventCompletionComponent,
-            router_1.ActivatedRoute])
+        __metadata("design:paramtypes", [case_event_completion_component_1.CaseEventCompletionComponent])
     ], CaseEventCompletionTaskCancelledComponent);
     return CaseEventCompletionTaskCancelledComponent;
 }());
@@ -16470,40 +16467,34 @@ var EventCompletionStateMachineService = /** @class */ (function () {
         this.addTransitionsForStateTaskUnassigned();
     };
     EventCompletionStateMachineService.prototype.entryActionForStateCheckTasksCanBeCompleted = function (state, context) {
-        context.workAllocationService.getTasksByCaseIdAndEventId(context.eventId, context.caseId).subscribe(function (payload) {
-            var taskPayLoad = payload;
-            if (taskPayLoad.task_required_for_event) {
-                var task = taskPayLoad.tasks.find(function (x) { return x.id === context.task.id; });
-                if (task && task.task_state) {
-                    switch (task.task_state.toUpperCase()) {
-                        case Task_1.TaskState.Unassigned:
-                            // Task unassigned
-                            state.trigger(domain_1.EventCompletionStates.TaskUnassigned);
-                            break;
-                        case Task_1.TaskState.Completed:
-                        case Task_1.TaskState.Cancelled:
-                            // Task completed or cancelled
-                            state.trigger(domain_1.EventCompletionStates.TaskCompetedOrCancelled);
-                            break;
-                        case Task_1.TaskState.Assigned:
-                            // Task is in assigned state
-                            task.assignee === context.task.assignee
-                                ? state.trigger(domain_1.EventCompletionStates.CompleteEventAndTask)
-                                : state.trigger(domain_1.EventCompletionStates.TaskAssignedToAnotherUser);
-                            break;
-                        default:
-                            // Task not assigned to user
-                            state.trigger(domain_1.EventCompletionStates.TaskAssignedToAnotherUser);
-                            break;
-                    }
+        context.workAllocationService.getTask(context.task.id).subscribe(function (taskResponse) {
+            if (taskResponse && taskResponse.task && taskResponse.task.task_state) {
+                switch (taskResponse.task.task_state.toUpperCase()) {
+                    case Task_1.TaskState.Unassigned:
+                        // Task unassigned
+                        state.trigger(domain_1.EventCompletionStates.TaskUnassigned);
+                        break;
+                    case Task_1.TaskState.Completed:
+                    case Task_1.TaskState.Cancelled:
+                    case Task_1.TaskState.Terminated:
+                        // Task completed or cancelled
+                        state.trigger(domain_1.EventCompletionStates.TaskCompetedOrCancelled);
+                        break;
+                    case Task_1.TaskState.Assigned:
+                        // Task is in assigned state
+                        taskResponse.task.assignee === context.task.assignee
+                            ? state.trigger(domain_1.EventCompletionStates.CompleteEventAndTask)
+                            : state.trigger(domain_1.EventCompletionStates.TaskAssignedToAnotherUser);
+                        break;
+                    default:
+                        // Allow user to complete the event
+                        state.trigger(domain_1.EventCompletionStates.CompleteEventAndTask);
+                        break;
                 }
             }
-            else {
-                // This code should never be hit, as checks are aleady in place in the parent component
-                // This is just a fail safe code
-                // Event completion checks not required, inform parent to complete the event
-                state.trigger(domain_1.EventCompletionStates.CompleteEventAndTask);
-            }
+        }, function (error) {
+            context.alertService.error(error.message);
+            return rxjs_1.throwError(error);
         });
     };
     EventCompletionStateMachineService.prototype.entryActionForStateTaskCompletedOrCancelled = function (state, context) {
@@ -17078,6 +17069,14 @@ var WorkAllocationService = /** @class */ (function () {
     WorkAllocationService.prototype.getTasksByCaseIdAndEventId = function (eventId, caseId) {
         return this.http.get(this.appConfig.getWorkAllocationApiUrl() + "/case/tasks/" + caseId + "/event/" + eventId);
     };
+    /**
+     * Call the API to get a task
+     *
+     * @param {string} taskId
+     */
+    WorkAllocationService.prototype.getTask = function (taskId) {
+        return this.http.get(this.appConfig.getWorkAllocationApiUrl() + "/task/" + taskId);
+    };
     var WorkAllocationService_1;
     WorkAllocationService.IACCaseOfficer = 'caseworker-ia-caseofficer';
     WorkAllocationService.IACAdmOfficer = 'caseworker-ia-admofficer';