@hmcts/ccd-case-ui-toolkit 4.12.6 → 4.12.7-task-event-completion

package/dist/index.umd.js

@@ -1,6 +1,6 @@
 /**
  * @hmcts/ccd-case-ui-toolkit - Case UI Toolkit
- * @version v4.12.6
+ * @version vv4.12.7-task-event-completion
  * @link undefined
  * @license MIT
  */
@@ -21990,8 +21990,8 @@ var WorkAllocationService = /** @class */ (function () {
      * @param eventId The ID of the event to find tasks for.
      * @param caseId The ID of the case to find tasks for.
      */
-    WorkAllocationService.prototype.getTasksByCaseIdAndEventId = function (eventId, caseId) {
-        return this.http.get(this.appConfig.getWorkAllocationApiUrl() + "/case/tasks/" + caseId + "/event/" + eventId);
+    WorkAllocationService.prototype.getTasksByCaseIdAndEventId = function (eventId, caseId, caseType, jurisdiction) {
+        return this.http.get(this.appConfig.getWorkAllocationApiUrl() + "/case/tasks/" + caseId + "/event/" + eventId + "/caseType/" + caseType + "/jurisdiction/" + jurisdiction);
     };
     /**
      * Call the API to get a task
@@ -26154,11 +26154,13 @@ var rxjs_1 = __webpack_require__(87318);
 var operators_1 = __webpack_require__(19443);
 var case_editor_1 = __webpack_require__(27070);
 var app_config_1 = __webpack_require__(35185);
+var services_1 = __webpack_require__(65010);
 var EventStartGuard = /** @class */ (function () {
-    function EventStartGuard(workAllocationService, router, appConfig) {
+    function EventStartGuard(workAllocationService, router, appConfig, sessionStorageService) {
         this.workAllocationService = workAllocationService;
         this.router = router;
         this.appConfig = appConfig;
+        this.sessionStorageService = sessionStorageService;
     }
     EventStartGuard.prototype.canActivate = function (route) {
         var _this = this;
@@ -26169,10 +26171,16 @@ var EventStartGuard = /** @class */ (function () {
             var taskId_1 = route.queryParams['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);
+            var caseInfoStr = this.sessionStorageService.getItem('caseInfo');
+            if (caseInfoStr) {
+                var caseInfo = JSON.parse(caseInfoStr);
+                if (caseInfo && caseInfo.cid === caseId_1) {
+                    if (isComplete) {
+                        return rxjs_1.of(true);
+                    }
+                    return this.workAllocationService.getTasksByCaseIdAndEventId(eventId_1, caseId_1, caseInfo.caseType, caseInfo.jurisdiction).pipe(operators_1.switchMap(function (payload) { return _this.checkForTasks(payload, caseId_1, eventId_1, taskId_1); }));
+                }
             }
-            return this.workAllocationService.getTasksByCaseIdAndEventId(eventId_1, caseId_1).pipe(operators_1.switchMap(function (payload) { return _this.checkForTasks(payload, caseId_1, eventId_1, taskId_1); }));
         }
         else {
             // Checks not required, return true by default for Work Allocation 1
@@ -26190,7 +26198,8 @@ var EventStartGuard = /** @class */ (function () {
         core_1.Injectable(),
         __metadata("design:paramtypes", [case_editor_1.WorkAllocationService,
             router_1.Router,
-            app_config_1.AbstractAppConfig])
+            app_config_1.AbstractAppConfig,
+            services_1.SessionStorageService])
     ], EventStartGuard);
     return EventStartGuard;
 }());
@@ -26411,19 +26420,26 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 var core_1 = __webpack_require__(57208);
 var case_editor_1 = __webpack_require__(27070);
 var operators_1 = __webpack_require__(19443);
+var services_1 = __webpack_require__(65010);
 var EventTasksResolverService = /** @class */ (function () {
-    function EventTasksResolverService(service) {
+    function EventTasksResolverService(service, sessionStorageService) {
         this.service = service;
+        this.sessionStorageService = sessionStorageService;
     }
     EventTasksResolverService.prototype.resolve = function (route) {
         var eventId = route.queryParamMap.get('eventId');
         var caseId = route.queryParamMap.get('caseId');
-        return this.service.getTasksByCaseIdAndEventId(eventId, caseId)
-            .pipe(operators_1.map(function (payload) { return payload.tasks; }));
+        var caseInfoStr = this.sessionStorageService.getItem('caseInfo');
+        var caseInfo = JSON.parse(caseInfoStr);
+        if (caseInfo) {
+            return this.service.getTasksByCaseIdAndEventId(eventId, caseId, caseInfo.caseType, caseInfo.jurisdiction)
+                .pipe(operators_1.map(function (payload) { return payload.tasks; }));
+        }
     };
     EventTasksResolverService = __decorate([
         core_1.Injectable(),
-        __metadata("design:paramtypes", [case_editor_1.WorkAllocationService])
+        __metadata("design:paramtypes", [case_editor_1.WorkAllocationService,
+            services_1.SessionStorageService])
     ], EventTasksResolverService);
     return EventTasksResolverService;
 }());
@@ -26513,7 +26529,9 @@ var EventStartStateMachineService = /** @class */ (function () {
         // Get number of tasks assigned to user
         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; });
+        var tasksAssignedToUser = context.tasks.filter(function (x) {
+            return x.task_state !== 'unassigned' && x.assignee === userInfo.id || x.assignee === userInfo.uid;
+        });
         // 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) {