@hmcts/ccd-case-ui-toolkit 6.18.4-EXUI-433-pass-all-fields-rc2 → 6.19.0-RetryCaseRetrievals.2

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

@@ -2022,6 +2022,18 @@
         AbstractAppConfig.prototype.getLocationRefApiUrl = function () {
             return undefined;
         };
+        AbstractAppConfig.prototype.getEnvironment = function () {
+            var _a, _b, _c, _d;
+            if ((_a = this.getActivityUrl()) === null || _a === void 0 ? void 0 : _a.includes('.aat.'))
+                return 'aat';
+            else if ((_b = this.getActivityUrl()) === null || _b === void 0 ? void 0 : _b.includes('.preview.'))
+                return 'preview';
+            else if ((_c = this.getActivityUrl()) === null || _c === void 0 ? void 0 : _c.includes('.demo.'))
+                return 'demo';
+            else if ((_d = this.getActivityUrl()) === null || _d === void 0 ? void 0 : _d.includes('.ithc.'))
+                return 'ithc';
+            return 'prod';
+        };
         AbstractAppConfig.prototype.getCamRoleAssignmentsApiUrl = function () {
             return undefined;
         };
@@ -8074,6 +8086,80 @@
             }], null, null);
     })();
 
+    var RetryUtil = /** @class */ (function () {
+        function RetryUtil() {
+            this.artificialDelayOn = true;
+            this.artificialDelayPeriod = Math.random() > 0.5 ? 60 : 3;
+        }
+        RetryUtil.prototype.switchArtificialDelays = function (status) {
+            this.artificialDelayOn = status;
+            this.artificialDelayPeriod = Math.random() > 0.5 ? 60 : 2;
+        };
+        RetryUtil.prototype.switchOnArtificialDelays = function () {
+            this.switchArtificialDelays(true);
+        };
+        RetryUtil.prototype.switchOffArtificialDelays = function () {
+            this.switchArtificialDelays(false);
+        };
+        RetryUtil.prototype.getArtificialDelayTime = function () {
+            return this.artificialDelayOn ? this.artificialDelayPeriod : 0;
+        };
+        RetryUtil.prototype.pipeTimeoutMechanismOn = function (in$, environment, timeoutPeriods) {
+            this.switchOnArtificialDelays();
+            var out$ = in$;
+            if (environment === 'aat') {
+                out$ = this.pipeArtificialDelayOn(out$);
+            }
+            out$ = this.pipeTimeOutControlOn(out$, timeoutPeriods);
+            out$ = this.pipeRetryMechanismOn(out$);
+            return out$;
+        };
+        RetryUtil.prototype.pipeTimeOutControlOn = function (in$, timeoutPeriods) {
+            var timeOutAfterSeconds = timeoutPeriods[0];
+            var out$ = in$.pipe(operators.timeout(timeOutAfterSeconds * 1000));
+            return out$;
+        };
+        RetryUtil.prototype.pipeRetryMechanismOn = function (in$) {
+            var _this = this;
+            var retryStrategy = function (errors) {
+                return errors.pipe(operators.mergeMap(function (error, i) {
+                    console.error("Mapping error " + (error === null || error === void 0 ? void 0 : error.name) + ", " + i);
+                    console.error(error);
+                    if ((error === null || error === void 0 ? void 0 : error.name) === 'TimeoutError' && i === 0) {
+                        _this.switchOffArtificialDelays();
+                        console.info('Will retry, after a timeout error.');
+                    }
+                    else {
+                        console.error('Will NOT retry.');
+                        rxjs.throwError(error);
+                    }
+                    return rxjs.timer(0);
+                }), operators.finalize(function () { return console.log('We are done!'); }));
+            };
+            var out$ = in$.pipe(operators.retryWhen(retryStrategy));
+            return out$;
+        };
+        RetryUtil.prototype.pipeArtificialDelayOn = function (in$) {
+            var _this = this;
+            var out$ = in$.pipe(operators.tap(function () {
+                console.log("Artificially delaying for " + _this.getArtificialDelayTime() + " seconds..");
+            }));
+            out$ = out$.pipe(operators.delayWhen(function () { return rxjs.timer(_this.getArtificialDelayTime() * 1000); }));
+            out$ = out$.pipe(operators.tap(function () {
+                console.log("Artificially delayed for " + _this.getArtificialDelayTime() + " seconds..");
+            }));
+            return out$;
+        };
+        return RetryUtil;
+    }());
+    RetryUtil.ɵfac = function RetryUtil_Factory(t) { return new (t || RetryUtil)(); };
+    RetryUtil.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: RetryUtil, factory: RetryUtil.ɵfac });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(RetryUtil, [{
+                type: i0.Injectable
+            }], null, null);
+    })();
+
     var WindowService = /** @class */ (function () {
         function WindowService() {
         }
@@ -8625,7 +8711,7 @@
     })();
 
     var CasesService = /** @class */ (function () {
-        function CasesService(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, loadingService, sessionStorageService) {
+        function CasesService(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, loadingService, sessionStorageService, retryUtil) {
             this.http = http;
             this.appConfig = appConfig;
             this.orderService = orderService;
@@ -8633,6 +8719,7 @@
             this.wizardPageFieldToCaseFieldMapper = wizardPageFieldToCaseFieldMapper;
             this.loadingService = loadingService;
             this.sessionStorageService = sessionStorageService;
+            this.retryUtil = retryUtil;
             this.get = this.getCaseView;
         }
         CasesService.updateChallengedAccessRequestAttributes = function (httpClient, caseId, attributesToUpdate) {
@@ -8666,14 +8753,21 @@
                 .set('Accept', CasesService.V2_MEDIATYPE_CASE_VIEW)
                 .set('Content-Type', 'application/json');
             var loadingToken = this.loadingService.register();
-            return this.http
-                .get(url, { headers: headers, observe: 'body' })
-                .pipe(operators.catchError(function (error) {
-                console.error('Error while getting case view with getCaseViewV2!');
+            var http$ = this.http.get(url, { headers: headers, observe: 'body' });
+            this.retryUtil.pipeTimeoutMechanismOn(http$, this.appConfig.getEnvironment(), this.appConfig.getCaseRetrievalTimeouts());
+            http$ = this.pipeErrorProcessor(http$);
+            http$ = http$.pipe(operators.finalize(function () { return _this.finalizeGetCaseViewWith(caseId, loadingToken); }));
+            return http$;
+        };
+        CasesService.prototype.pipeErrorProcessor = function (in$) {
+            var _this = this;
+            var out$$ = in$.pipe(operators.catchError(function (error) {
+                console.error("Error while getting case view with getCaseViewV2! Error type: '" + typeof error + ", Error name: '" + (error === null || error === void 0 ? void 0 : error.name) + "'");
                 console.error(error);
                 _this.errorService.setError(error);
                 return rxjs.throwError(error);
-            }), operators.finalize(function () { return _this.finalizeGetCaseViewWith(caseId, loadingToken); }));
+            }));
+            return out$$;
         };
         CasesService.prototype.syncWait = function (seconds) {
             var end = Date.now() + seconds * 1000;
@@ -8871,12 +8965,12 @@
     CasesService.V2_MEDIATYPE_CREATE_EVENT = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.create-event.v2+json;charset=UTF-8';
     CasesService.V2_MEDIATYPE_CREATE_CASE = 'application/vnd.uk.gov.hmcts.ccd-data-store-api.create-case.v2+json;charset=UTF-8';
     CasesService.PUI_CASE_MANAGER = 'pui-case-manager';
-    CasesService.ɵfac = function CasesService_Factory(t) { return new (t || CasesService)(i0__namespace.ɵɵinject(HttpService), i0__namespace.ɵɵinject(AbstractAppConfig), i0__namespace.ɵɵinject(OrderService), i0__namespace.ɵɵinject(HttpErrorService), i0__namespace.ɵɵinject(WizardPageFieldToCaseFieldMapper), i0__namespace.ɵɵinject(LoadingService), i0__namespace.ɵɵinject(SessionStorageService)); };
+    CasesService.ɵfac = function CasesService_Factory(t) { return new (t || CasesService)(i0__namespace.ɵɵinject(HttpService), i0__namespace.ɵɵinject(AbstractAppConfig), i0__namespace.ɵɵinject(OrderService), i0__namespace.ɵɵinject(HttpErrorService), i0__namespace.ɵɵinject(WizardPageFieldToCaseFieldMapper), i0__namespace.ɵɵinject(LoadingService), i0__namespace.ɵɵinject(SessionStorageService), i0__namespace.ɵɵinject(RetryUtil)); };
     CasesService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: CasesService, factory: CasesService.ɵfac });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CasesService, [{
                 type: i0.Injectable
-            }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: OrderService }, { type: HttpErrorService }, { type: WizardPageFieldToCaseFieldMapper }, { type: LoadingService }, { type: SessionStorageService }]; }, null);
+            }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: OrderService }, { type: HttpErrorService }, { type: WizardPageFieldToCaseFieldMapper }, { type: LoadingService }, { type: SessionStorageService }, { type: RetryUtil }]; }, null);
     })();
 
     var EventTriggerService = /** @class */ (function () {
@@ -11082,6 +11176,10 @@
                     _this.handleError(error);
                 });
                 CaseEditPageComponent.scrollToTop();
+                // Remove all JudicialUser FormControls with the ID suffix "_judicialUserControl" because these are not
+                // intended to be present in the Case Event data (they are added only for value selection and validation
+                // purposes)
+                this.removeAllJudicialUserFormControls(this.currentPage, this.editForm);
             }
             CaseEditPageComponent.setFocusToTop();
         };
@@ -11353,6 +11451,13 @@
                 submit: this.caseEdit.submit,
             });
         };
+        CaseEditPageComponent.prototype.removeAllJudicialUserFormControls = function (page, editForm) {
+            page.case_fields.forEach(function (caseField) {
+                if (FieldsUtils.isCaseFieldOfType(caseField, ['JudicialUser'])) {
+                    editForm.controls['data'].removeControl(caseField.id + "_judicialUserControl");
+                }
+            });
+        };
         return CaseEditPageComponent;
     }());
     CaseEditPageComponent.RESUMED_FORM_DISCARD = 'RESUMED_FORM_DISCARD';
@@ -26311,7 +26416,7 @@
             var checkConditionalShowAgainst = values;
             var formGroupAvailable = false;
             if (formGroup) {
-                checkConditionalShowAgainst = formGroup.value ? formGroup.value : formGroup;
+                checkConditionalShowAgainst = formGroup.value;
                 formGroupAvailable = true;
             }
             return fields
@@ -27317,7 +27422,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.allFieldsValues))));
+            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"]))));
         }
     }
     function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_Template(rf, ctx) {
@@ -27585,7 +27690,6 @@
             this.caseEdit.isLinkedCasesSubmission =
                 this.eventTrigger.case_fields.some(function (caseField) { return FieldsUtils.isCaseFieldOfType(caseField, ['ComponentLauncher']); });
             this.pageTitle = this.caseEdit.isCaseFlagSubmission ? 'Review flag details' : 'Check your answers';
-            this.allFieldsValues = this.editForm.getRawValue().data;
         };
         CaseEditSubmitComponent.prototype.ngOnDestroy = function () {
             /* istanbul ignore else */
@@ -37594,6 +37698,7 @@
     exports.ReadYesNoFieldComponent = ReadYesNoFieldComponent;
     exports.RemoveDialogComponent = RemoveDialogComponent;
     exports.RequestOptionsBuilder = RequestOptionsBuilder;
+    exports.RetryUtil = RetryUtil;
     exports.RouterHelperService = RouterHelperService;
     exports.SaveOrDiscardDialogComponent = SaveOrDiscardDialogComponent;
     exports.SearchFiltersComponent = SearchFiltersComponent;