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

package/RELEASE-NOTES.md

@@ -1,6 +1,6 @@
 ## RELEASE NOTES
 
-### Version 4.9.13-state-machine"
+### Version 4.9.14-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.13-state-machine
+ * @version v4.9.14-state-machine
  * @link undefined
  * @license MIT
  */
@@ -15426,24 +15426,28 @@ var CaseEventCompletionTaskReassignedComponent = /** @class */ (function () {
     }
     CaseEventCompletionTaskReassignedComponent.prototype.ngOnInit = function () {
         var _this = this;
-        // Get case id and assigned user id from the parent component
-        this.assignedUserId = this.parentComponent.context.task.assignee;
+        // Get case id and task from the parent component
         this.caseId = this.parentComponent.context.caseId;
-        // Get the caseworker based on the assigned user id
-        var caseworkers$ = this.caseworkerService.getCaseworkers([this.assignedUserId]);
-        this.caseworkerSubscription = caseworkers$.subscribe(function (caseworkers) {
-            if (caseworkers && caseworkers[0] && caseworkers[0].firstName && caseworkers[0].lastName) {
-                _this.assignedUserName = caseworkers[0].firstName + " " + caseworkers[0].lastName;
+        var task = this.parentComponent.context.task;
+        // Current user is a caseworker?
+        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(task.jurisdiction).subscribe(function (result) {
+            if (result && result[0].service === task.jurisdiction && result[0].caseworkers) {
+                var caseworker = result[0].caseworkers.find(function (x) { return x.idamId === task.assignee; });
+                if (caseworker) {
+                    _this.assignedUserName = caseworker.firstName + " " + caseworker.lastName;
+                }
             }
-            else {
-                // Get the judicial worker based on the assigned user id
-                var judicialworkers$ = _this.judicialworkerService.getJudicialworkers([_this.assignedUserId]);
-                _this.judicialworkerSubscription = judicialworkers$.subscribe(function (judicialworkers) {
-                    if (judicialworkers && judicialworkers[0].firstName && judicialworkers[0].lastName) {
-                        _this.assignedUserName = judicialworkers[0].firstName + " " + judicialworkers[0].lastName;
+            if (!_this.assignedUserName) {
+                // Current user is a judicial user?
+                _this.judicialworkerSubscription = _this.judicialworkerService.getJudicialworkers([task.assignee], task.jurisdiction)
+                    .subscribe(function (judicialworkers) {
+                    if (judicialworkers) {
+                        var judicialworker = judicialworkers.find(function (x) { return x.sidam_id === task.assignee; });
+                        if (judicialworker) {
+                            _this.assignedUserName = judicialworker.full_name;
+                        }
                     }
-                    else {
-                        // As a fail safe display assigned user name as 'another user'
+                    if (!_this.assignedUserName) {
                         _this.assignedUserName = 'another user';
                     }
                 });
@@ -16080,11 +16084,11 @@ var CaseworkerService = /** @class */ (function () {
         this.appConfig = appConfig;
         this.errorService = errorService;
     }
-    CaseworkerService.prototype.getCaseworkers = function (userIds) {
+    CaseworkerService.prototype.getCaseworkers = function (serviceId) {
         var _this = this;
-        var url = this.appConfig.getWorkAllocationApiUrl() + "/caseworker";
+        var url = this.appConfig.getWorkAllocationApiUrl() + "/retrieveCaseWorkersForServices";
         return this.http
-            .post(url, { userIds: userIds })
+            .post(url, { serviceIds: [serviceId] })
             .pipe(operators_1.catchError(function (error) {
             _this.errorService.setError(error);
             return rxjs_1.throwError(error);
@@ -16655,11 +16659,11 @@ var JudicialworkerService = /** @class */ (function () {
         this.appConfig = appConfig;
         this.errorService = errorService;
     }
-    JudicialworkerService.prototype.getJudicialworkers = function (userIds) {
+    JudicialworkerService.prototype.getJudicialworkers = function (userIds, serviceId) {
         var _this = this;
-        var url = this.appConfig.getWorkAllocationApiUrl() + "/roles/getJudicialUsers";
+        var url = this.appConfig.getWorkAllocationApiUrl() + "/getJudicialUsers";
         return this.http
-            .post(url, { userIds: userIds })
+            .post(url, { userIds: userIds, services: [serviceId] })
             .pipe(operators_1.catchError(function (error) {
             _this.errorService.setError(error);
             return rxjs_1.throwError(error);
@@ -21030,24 +21034,31 @@ var TaskAssignedComponent = /** @class */ (function () {
     }
     TaskAssignedComponent.prototype.ngOnInit = function () {
         var _this = this;
-        // Get the caseworker based on the assigned user id
-        var caseworkers$ = this.caseworkerService.getCaseworkers([this.task.assignee]);
-        this.caseworkerSubscription = caseworkers$.subscribe(function (caseworkers) {
-            if (caseworkers && caseworkers[0] && caseworkers[0].firstName && caseworkers[0].lastName) {
-                _this.assignedUserName = caseworkers[0].firstName + " " + caseworkers[0].lastName;
+        // Current user is a caseworker?
+        this.caseworkerSubscription = this.caseworkerService.getCaseworkers(this.task.jurisdiction).subscribe(function (result) {
+            console.log('CASE WORKERS', result);
+            if (result && result[0].service === _this.task.jurisdiction && result[0].caseworkers) {
+                var caseworker = result[0].caseworkers.find(function (x) { return x.idamId === _this.task.assignee; });
+                if (caseworker) {
+                    _this.assignedUserName = caseworker.firstName + " " + caseworker.lastName;
+                }
             }
-            else {
-                // Get the judicial worker based on the assigned user id
-                var judicialworkers$ = _this.judicialworkerService.getJudicialworkers([_this.task.assignee]);
-                _this.judicialworkerSubscription = judicialworkers$.subscribe(function (judicialworkers) {
-                    if (judicialworkers && judicialworkers[0].firstName && judicialworkers[0].lastName) {
-                        _this.assignedUserName = judicialworkers[0].firstName + " " + judicialworkers[0].lastName;
-                    }
-                    else {
-                        // As a fail safe display assigned user name as 'another user'
-                        _this.assignedUserName = 'another user';
-                    }
-                });
+            if (!_this.assignedUserName) {
+                // Current user is a judicial user?
+                _this.judicialworkerSubscription =
+                    _this.judicialworkerService.getJudicialworkers([_this.task.assignee], _this.task.jurisdiction)
+                        .subscribe(function (judicialworkers) {
+                        console.log('JUDICIAL WORKERS', result);
+                        if (judicialworkers) {
+                            var judicialworker = judicialworkers.find(function (x) { return x.sidam_id === _this.task.assignee; });
+                            if (judicialworker) {
+                                _this.assignedUserName = judicialworker.full_name;
+                            }
+                        }
+                        if (!_this.assignedUserName) {
+                            _this.assignedUserName = 'another user';
+                        }
+                    });
             }
         });
     };
@@ -21207,22 +21218,31 @@ var router_1 = __webpack_require__(92302);
 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 EventStartGuard = /** @class */ (function () {
-    function EventStartGuard(workAllocationService, router) {
+    function EventStartGuard(workAllocationService, router, appConfig) {
         this.workAllocationService = workAllocationService;
         this.router = router;
+        this.appConfig = appConfig;
     }
     EventStartGuard.prototype.canActivate = function (route) {
         var _this = this;
-        var caseId = route.params['cid'];
-        var eventId = route.params['eid'];
-        var taskId = route.queryParams['tid'];
-        // TODO: NavigationExtras should be used once Angular upgrade changes have been incorporated
-        var isComplete = route.queryParams['isComplete'];
-        if (isComplete) {
+        // Checks must be performed only for Work Allocation 2
+        if (this.appConfig.getWorkAllocationApiUrl().toLowerCase() === 'workallocation2') {
+            var caseId_1 = route.params['cid'];
+            var eventId_1 = route.params['eid'];
+            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);
+            }
+            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
             return rxjs_1.of(true);
         }
-        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, taskId) {
         if (payload.task_required_for_event) {
@@ -21233,7 +21253,9 @@ var EventStartGuard = /** @class */ (function () {
     };
     EventStartGuard = __decorate([
         core_1.Injectable(),
-        __metadata("design:paramtypes", [case_editor_1.WorkAllocationService, router_1.Router])
+        __metadata("design:paramtypes", [case_editor_1.WorkAllocationService,
+            router_1.Router,
+            app_config_1.AbstractAppConfig])
     ], EventStartGuard);
     return EventStartGuard;
 }());
@@ -84177,7 +84199,7 @@ module.exports = "<ng-template [cdkPortalOutlet]=\"selectedComponentPortal\"></n
 /***/ 69675:
 /***/ ((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 cancelled/marked as done</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 cancelled/marked as done</h2>\n\n    <p>This task has been cancelled or marked as done.</p>\n\n    <p>Click Continue to complete the task and save your progress.</p>\n\n    <p>Alternatively, click Cancel to return to the tasks tab without saving your progress.</p>\n\n    <div class=\"form-group form-group-related\">\n      <button class=\"govuk-button govuk-!-margin-right-2\" data-module=\"govuk-button\" (click)=\"onContinue()\">Continue</button>\n      <a [routerLink]=\"['/', 'cases', 'case-details', caseId, 'tasks']\"\n              class=\"govuk-button govuk-button--secondary\" data-module=\"govuk-button\">Cancel</a>\n    </div>\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 cancelled/marked as done</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 cancelled/marked as done</h2>\n\n    <p>This task has been cancelled or marked as done.</p>\n\n    <p>Click Continue to complete the event and save your progress.</p>\n\n    <p>Alternatively, click Cancel to return to the tasks tab without saving your progress.</p>\n\n    <div class=\"form-group form-group-related\">\n      <button class=\"govuk-button govuk-!-margin-right-2\" data-module=\"govuk-button\" (click)=\"onContinue()\">Continue</button>\n      <a [routerLink]=\"['/', 'cases', 'case-details', caseId, 'tasks']\"\n              class=\"govuk-button govuk-button--secondary\" data-module=\"govuk-button\">Cancel</a>\n    </div>\n  </div>\n</div>\n"
 
 /***/ }),