@hmcts/ccd-case-ui-toolkit 5.0.51-restricted-case-access → 5.0.53-prevent-clear-page-from-cya

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -10400,12 +10400,35 @@
             return this.wizard.findWizardPage(caseFieldId);
         };
         CaseEditPageComponent.prototype.updateEventTriggerCaseFields = function (caseFieldId, jsonData, eventTrigger) {
-            if (eventTrigger.case_fields) {
+            var _this = this;
+            if (eventTrigger === null || eventTrigger === void 0 ? void 0 : eventTrigger.case_fields) {
                 eventTrigger.case_fields
                     .filter(function (element) { return element.id === caseFieldId; })
-                    .forEach(function (element) { return element.value = jsonData.data[caseFieldId]; });
+                    .forEach(function (element) {
+                    if (_this.isAnObject(element.value)) {
+                        var updatedJsonDataObject = _this.updateJsonDataObject(caseFieldId, jsonData, element);
+                        element.value = Object.assign(Object.assign({}, element.value), updatedJsonDataObject);
+                    }
+                    else {
+                        element.value = jsonData.data[caseFieldId];
+                    }
+                });
             }
         };
+        CaseEditPageComponent.prototype.updateJsonDataObject = function (caseFieldId, jsonData, element) {
+            var _this = this;
+            return Object.keys(jsonData.data[caseFieldId]).reduce(function (acc, key) {
+                var _a;
+                var elementValue = element.value[key];
+                var jsonDataValue = jsonData.data[caseFieldId][key];
+                var hasElementGotValueProperty = _this.isAnObject(elementValue) && elementValue.value !== undefined;
+                var jsonDataOrElementValue = (jsonDataValue === null || jsonDataValue === void 0 ? void 0 : jsonDataValue.value) !== null && (jsonDataValue === null || jsonDataValue === void 0 ? void 0 : jsonDataValue.value) !== undefined ? jsonDataValue : elementValue;
+                return Object.assign(Object.assign({}, acc), (_a = {}, _a["" + key] = hasElementGotValueProperty ? jsonDataOrElementValue : jsonDataValue, _a));
+            }, {});
+        };
+        CaseEditPageComponent.prototype.isAnObject = function (property) {
+            return typeof property === 'object' && !Array.isArray(property) && property !== null;
+        };
         CaseEditPageComponent.prototype.updateFormControlsValue = function (formGroup, caseFieldId, value) {
             var theControl = formGroup.controls['data'].get(caseFieldId);
             if (theControl && theControl['status'] !== 'DISABLED') {
@@ -29218,7 +29241,7 @@
                 }
                 else {
                     return this.caseNotifier.fetchAndRefresh(cid)
-                        .pipe(operators.catchError(function (error) { return _this.checkAuthorizationError(error, cid); }))
+                        .pipe(operators.catchError(function (error) { return _this.checkAuthorizationError(error); }))
                         .toPromise();
                 }
             }
@@ -29231,24 +29254,20 @@
                 _this.caseNotifier.cachedCaseView = classTransformer.plainToClassFromExist(new CaseView(), caseView);
                 _this.caseNotifier.announceCase(_this.caseNotifier.cachedCaseView);
                 return _this.caseNotifier.cachedCaseView;
-            }), operators.catchError(function (error) { return _this.checkAuthorizationError(error, cid); })).toPromise();
+            }), operators.catchError(function (error) { return _this.checkAuthorizationError(error); })).toPromise();
         };
-        CaseResolver.prototype.checkAuthorizationError = function (error, caseReference) {
+        CaseResolver.prototype.checkAuthorizationError = function (error) {
             // TODO Should be logged to remote logging infrastructure
             if (error.status === 400) {
                 this.router.navigate(['/search/noresults']);
                 return rxjs.of(null);
             }
+            console.error(error);
             if (CaseResolver.EVENT_REGEX.test(this.previousUrl) && error.status === 404) {
                 this.router.navigate(['/list/case']);
                 return rxjs.of(null);
             }
-            // Error 403, navigate to restricted case access page
-            if (error.status === 403) {
-                this.router.navigate(["/cases/restricted-case-access/" + caseReference]);
-                return rxjs.of(null);
-            }
-            if (error.status !== 401) {
+            if (error.status !== 401 && error.status !== 403) {
                 this.router.navigate(['/error']);
             }
             this.goToDefaultPage();