@hmcts/ccd-case-ui-toolkit 6.19.15-prerelease-datetime-picker-fix-new → 6.19.15-restricted-case-access

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

@@ -1985,6 +1985,13 @@
                     error[key] = response.error.hasOwnProperty(key) && response.error[key] ? response.error[key] : error[key];
                 });
             }
+            // Error object in HttpErrorResponse will be empty for 403 errors
+            // Set the error properties of HttpError accordingly
+            if ((response === null || response === void 0 ? void 0 : response.status) === 403) {
+                error.error = response.statusText;
+                error.status = response.status;
+                error.message = response.message;
+            }
             return error;
         };
         return HttpError;
@@ -2083,14 +2090,13 @@
             this.authService = authService;
         }
         HttpErrorService.convertToHttpError = function (error) {
+            var _a;
             if (error instanceof HttpError) {
                 return error;
             }
             var httpError = new HttpError();
             if (error instanceof i1$2.HttpErrorResponse) {
-                if (error.headers
-                    && error.headers.get(HttpErrorService.CONTENT_TYPE)
-                    && error.headers.get(HttpErrorService.CONTENT_TYPE).indexOf(HttpErrorService.JSON) !== -1) {
+                if (((_a = error.headers) === null || _a === void 0 ? void 0 : _a.get(HttpErrorService.CONTENT_TYPE).indexOf(HttpErrorService.JSON)) !== -1) {
                     try {
                         httpError = HttpError.from(error);
                     }
@@ -2125,7 +2131,7 @@
             console.error('Handling error in http error service.');
             console.error(error);
             var httpError = HttpErrorService.convertToHttpError(error);
-            if (redirectIfNotAuthorised && (httpError.status === 401 || httpError.status === 403)) {
+            if (redirectIfNotAuthorised && httpError.status === 401) {
                 this.authService.signIn();
             }
             return rxjs.throwError(httpError);
@@ -6403,7 +6409,7 @@
                     if (!FormValueService.isLabel(field) && FormValueService.isReadOnly(field)) {
                         return "continue";
                     }
-                    if (field.hidden === true && field.display_context !== 'HIDDEN' && field.id !== 'caseLinks') {
+                    if (field.hidden === true && field.display_context !== 'HIDDEN' && field.id !== 'caseLinks' && !field.retain_hidden_value) {
                         // Delete anything that is hidden (that is NOT readonly), and that
                         // hasn't had its display_context overridden to make it hidden.
                         delete data[field.id];
@@ -9889,14 +9895,13 @@
         function ValidPageListCaseFieldsService(fieldsUtils) {
             this.fieldsUtils = fieldsUtils;
         }
-        ValidPageListCaseFieldsService.prototype.isShown = function (page, eventTriggerFields, data) {
+        ValidPageListCaseFieldsService.prototype.isShown = function (page, eventTriggerFields, formFields) {
             var fields = this.fieldsUtils
-                .mergeCaseFieldsAndFormFields(eventTriggerFields, data);
+                .mergeCaseFieldsAndFormFields(eventTriggerFields, formFields);
             return page.parsedShowCondition.match(fields);
         };
-        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, caseEventDatadata, eventTriggerFields, fromPreviousPage) {
-            if (fromPreviousPage === void 0) { fromPreviousPage = false; }
-            var pageListCaseFields = this.validPageListCaseFields(validPageList, caseEventDatadata, eventTriggerFields);
+        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, caseEventDatadata, eventTriggerFields, fromPreviousPage, formFields) {
+            var pageListCaseFields = this.validPageListCaseFields(validPageList, eventTriggerFields, formFields);
             if (!fromPreviousPage && pageListCaseFields.length > 0) {
                 Object.keys(caseEventDatadata).forEach(function (key) {
                     if (pageListCaseFields.findIndex(function (element) { return element.id === key; }) < 0) {
@@ -9905,11 +9910,11 @@
                 });
             }
         };
-        ValidPageListCaseFieldsService.prototype.validPageListCaseFields = function (validPageList, data, eventTriggerFields) {
+        ValidPageListCaseFieldsService.prototype.validPageListCaseFields = function (validPageList, eventTriggerFields, formFields) {
             var _this = this;
             var validPageListCaseFields = [];
             validPageList.forEach(function (page) {
-                if (_this.isShown(page, eventTriggerFields, data)) {
+                if (_this.isShown(page, eventTriggerFields, formFields)) {
                     page.case_fields.forEach(function (field) { return validPageListCaseFields.push(field); });
                 }
             });
@@ -10114,8 +10119,8 @@
             // Remove "Launcher"-type fields (these have no values and are not intended to be persisted)
             this.formValueService.removeCaseFieldsOfType(caseEventData.data, eventTrigger.case_fields, ['FlagLauncher', 'ComponentLauncher']);
             // delete fields which are not part of the case event journey wizard pages case fields
-            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, eventTrigger.case_fields, false);
-            var pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, caseEventData.data, eventTrigger.case_fields);
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, eventTrigger.case_fields, false, form.controls['data'].value);
+            var pageListCaseFields = this.validPageListCaseFieldsService.validPageListCaseFields(this.validPageList, eventTrigger.case_fields, form.controls['data'].value);
             // Remove unnecessary case fields which are hidden, only if the submission is *not* for Case Flags
             if (!this.isCaseFlagSubmission) {
                 this.formValueService.removeUnnecessaryFields(caseEventData.data, pageListCaseFields, true, true);
@@ -11494,7 +11499,7 @@
             // Get hold of the CaseEventData.
             var caseEventData = this.formValueService.sanitise(formFields);
             // delete fields which are not part of the case event journey wizard pages case fields
-            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage);
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, this.eventTrigger.case_fields, fromPreviousPage, this.editForm.controls['data'].value);
             // Tidy it up before we return it.
             this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
             return caseEventData;
@@ -25030,10 +25035,10 @@
 
     var CUSTOM_MOMENT_FORMATS = {
         parse: {
-            dateInput: 'DD-MM-YYYY HH:mm:ss'
+            dateInput: 'YYYY MM DD HH:mm:ss'
         },
         display: {
-            dateInput: 'DD-MM-YYYY HH:mm:ss',
+            dateInput: 'YYYY MM DD HH:mm:ss',
             monthYearLabel: 'MMMM YYYY',
             dateA11yLabel: 'EEE/MMM/YYYY',
             monthYearA11yLabel: 'MMMM YYYY',
@@ -26555,7 +26560,7 @@
             var checkConditionalShowAgainst = values;
             var formGroupAvailable = false;
             if (formGroup) {
-                checkConditionalShowAgainst = formGroup.parent.getRawValue().data;
+                checkConditionalShowAgainst = formGroup.value ? formGroup.parent.getRawValue().data : formGroup;
                 formGroupAvailable = true;
                 if (idPrefix !== undefined) {
                     if (idPrefix !== '') {
@@ -27573,7 +27578,7 @@
             var page_r13 = i0__namespace.ɵɵnextContext().$implicit;
             var ctx_r14 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(12, _c0$f, i0__namespace.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.editForm.controls["data"]))));
+            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(12, _c0$f, i0__namespace.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.allFieldsValues))));
         }
     }
     function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_Template(rf, ctx) {
@@ -27826,6 +27831,7 @@
         });
         CaseEditSubmitComponent.prototype.ngOnInit = function () {
             var _this = this;
+            var _a, _b, _c;
             this.profileSubscription = this.profileNotifier.profile.subscribe(function (_) { return _this.profile = _; });
             this.eventTrigger = this.caseEdit.eventTrigger;
             this.triggerText = this.eventTrigger.end_button_label || CallbackErrorsComponent.TRIGGER_TEXT_SUBMIT;
@@ -27834,6 +27840,11 @@
             this.showSummaryFields = this.sortFieldsByShowSummaryContent(this.eventTrigger.case_fields);
             this.caseEdit.isSubmitting = false;
             this.contextFields = this.getCaseFields();
+            this.metadataFieldsObject = (_c = (_b = (_a = this.caseEdit) === null || _a === void 0 ? void 0 : _a.caseDetails) === null || _b === void 0 ? void 0 : _b.metadataFields) === null || _c === void 0 ? void 0 : _c.reduce(function (o, key) {
+                var _d;
+                return Object.assign(o, (_d = {}, _d[key.id] = key.value, _d));
+            }, {});
+            this.allFieldsValues = Object.assign(this.metadataFieldsObject ? this.metadataFieldsObject : {}, this.editForm.getRawValue().data);
             // Indicates if the submission is for a Case Flag, as opposed to a "regular" form submission, by the presence of
             // a FlagLauncher field in the event trigger
             this.caseEdit.isCaseFlagSubmission =
@@ -31076,13 +31087,14 @@
     i0__namespace.ɵɵsetComponentScope(CaseTimelineComponent, [i2__namespace.NgIf, i2__namespace.NgSwitch, i2__namespace.NgSwitchCase, EventLogComponent, CaseHistoryComponent], [i1__namespace.RpxTranslatePipe]);
 
     var CaseResolver = /** @class */ (function () {
-        function CaseResolver(caseNotifier, draftService, navigationNotifierService, router, sessionStorage) {
+        function CaseResolver(caseNotifier, draftService, navigationNotifierService, router, sessionStorage, appConfig) {
             var _this = this;
             this.caseNotifier = caseNotifier;
             this.draftService = draftService;
             this.navigationNotifierService = navigationNotifierService;
             this.router = router;
             this.sessionStorage = sessionStorage;
+            this.appConfig = appConfig;
             router.events.pipe(operators.filter(function (event) { return event instanceof i1$1.NavigationEnd; }))
                 .subscribe(function (event) {
                 _this.previousUrl = event.url;
@@ -31128,7 +31140,7 @@
                 else {
                     console.info('getAndCacheCaseView - Path B.');
                     return this.caseNotifier.fetchAndRefresh(cid)
-                        .pipe(operators.catchError(function (error) { return _this.processErrorInCaseFetch(error); }))
+                        .pipe(operators.catchError(function (error) { return _this.processErrorInCaseFetch(error, cid); }))
                         .toPromise();
                 }
             }
@@ -31141,9 +31153,9 @@
                 _this.caseNotifier.cachedCaseView = classTransformer.plainToClassFromExist(new CaseView(), caseView);
                 _this.caseNotifier.announceCase(_this.caseNotifier.cachedCaseView);
                 return _this.caseNotifier.cachedCaseView;
-            }), operators.catchError(function (error) { return _this.processErrorInCaseFetch(error); })).toPromise();
+            }), operators.catchError(function (error) { return _this.processErrorInCaseFetch(error, cid); })).toPromise();
         };
-        CaseResolver.prototype.processErrorInCaseFetch = function (error) {
+        CaseResolver.prototype.processErrorInCaseFetch = function (error, caseReference) {
             console.error('!!! processErrorInCaseFetch !!!');
             console.error(error);
             // TODO Should be logged to remote logging infrastructure
@@ -31151,12 +31163,16 @@
                 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);
             }
-            if (error.status !== 401 && error.status !== 403) {
+            // Error 403 and enable-restricted-case-access Launch Darkly flag is enabled, navigate to restricted case access page
+            if (error.status === 403 && this.appConfig.getEnableRestrictedCaseAccessConfig()) {
+                this.router.navigate(["/cases/restricted-case-access/" + caseReference]);
+                return rxjs.of(null);
+            }
+            if (error.status !== 401) {
                 this.router.navigate(['/error']);
             }
             this.goToDefaultPage();
@@ -31183,12 +31199,12 @@
     CaseResolver.CASE_CREATED_MSG = 'The case has been created successfully';
     CaseResolver.defaultWAPage = '/work/my-work/list';
     CaseResolver.defaultPage = '/cases';
-    CaseResolver.ɵfac = function CaseResolver_Factory(t) { return new (t || CaseResolver)(i0__namespace.ɵɵinject(CaseNotifier), i0__namespace.ɵɵinject(DraftService), i0__namespace.ɵɵinject(NavigationNotifierService), i0__namespace.ɵɵinject(i1__namespace$1.Router), i0__namespace.ɵɵinject(SessionStorageService)); };
+    CaseResolver.ɵfac = function CaseResolver_Factory(t) { return new (t || CaseResolver)(i0__namespace.ɵɵinject(CaseNotifier), i0__namespace.ɵɵinject(DraftService), i0__namespace.ɵɵinject(NavigationNotifierService), i0__namespace.ɵɵinject(i1__namespace$1.Router), i0__namespace.ɵɵinject(SessionStorageService), i0__namespace.ɵɵinject(AbstractAppConfig)); };
     CaseResolver.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: CaseResolver, factory: CaseResolver.ɵfac });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseResolver, [{
                 type: i0.Injectable
-            }], function () { return [{ type: CaseNotifier }, { type: DraftService }, { type: NavigationNotifierService }, { type: i1__namespace$1.Router }, { type: SessionStorageService }]; }, null);
+            }], function () { return [{ type: CaseNotifier }, { type: DraftService }, { type: NavigationNotifierService }, { type: i1__namespace$1.Router }, { type: SessionStorageService }, { type: AbstractAppConfig }]; }, null);
     })();
 
     var EventTriggerResolver = /** @class */ (function () {