@hmcts/ccd-case-ui-toolkit 6.19.0-RetryCaseRetrievals.1 → 6.19.0-RetryCaseRetrievals.3

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

@@ -8086,6 +8086,83 @@
             }], null, null);
     })();
 
+    var RetryUtil = /** @class */ (function () {
+        function RetryUtil() {
+            this.artificialDelayOn = true;
+            this.artificialDelayPeriod = this.pickARandomValue();
+        }
+        RetryUtil.prototype.switchArtificialDelays = function (status) {
+            this.artificialDelayOn = status;
+            this.artificialDelayPeriod = this.pickARandomValue();
+        };
+        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$;
+        };
+        RetryUtil.prototype.pickARandomValue = function () {
+            return Date.now() % 2 == 0 ? 60 : 3;
+        };
+        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() {
         }
@@ -8636,82 +8713,8 @@
             }], null, null);
     })();
 
-    var RxjsUtils = /** @class */ (function () {
-        function RxjsUtils() {
-            this.artificialDelayOn = true;
-            this.artificialDelayPeriod = Math.random() > 0.5 ? 60 : 3;
-        }
-        RxjsUtils.prototype.switchArtificialDelays = function (status) {
-            this.artificialDelayOn = status;
-            this.artificialDelayPeriod = Math.random() > 0.5 ? 60 : 2;
-        };
-        RxjsUtils.prototype.switchOnArtificialDelays = function () {
-            this.switchArtificialDelays(true);
-        };
-        RxjsUtils.prototype.switchOffArtificialDelays = function () {
-            this.switchArtificialDelays(false);
-        };
-        RxjsUtils.prototype.getArtificialDelayTime = function () {
-            return this.artificialDelayOn ? this.artificialDelayPeriod : 0;
-        };
-        RxjsUtils.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$;
-        };
-        RxjsUtils.prototype.pipeTimeOutControlOn = function (in$, timeoutPeriods) {
-            var timeOutAfterSeconds = timeoutPeriods[0];
-            var out$ = in$.pipe(operators.timeout(timeOutAfterSeconds * 1000));
-            return out$;
-        };
-        RxjsUtils.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$;
-        };
-        RxjsUtils.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 RxjsUtils;
-    }());
-    RxjsUtils.ɵfac = function RxjsUtils_Factory(t) { return new (t || RxjsUtils)(); };
-    RxjsUtils.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: RxjsUtils, factory: RxjsUtils.ɵfac });
-    (function () {
-        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(RxjsUtils, [{
-                type: i0.Injectable
-            }], null, null);
-    })();
-
     var CasesService = /** @class */ (function () {
-        function CasesService(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, loadingService, sessionStorageService, rxjsUtils) {
+        function CasesService(http, appConfig, orderService, errorService, wizardPageFieldToCaseFieldMapper, loadingService, sessionStorageService, retryUtil) {
             this.http = http;
             this.appConfig = appConfig;
             this.orderService = orderService;
@@ -8719,7 +8722,7 @@
             this.wizardPageFieldToCaseFieldMapper = wizardPageFieldToCaseFieldMapper;
             this.loadingService = loadingService;
             this.sessionStorageService = sessionStorageService;
-            this.rxjsUtils = rxjsUtils;
+            this.retryUtil = retryUtil;
             this.get = this.getCaseView;
         }
         CasesService.updateChallengedAccessRequestAttributes = function (httpClient, caseId, attributesToUpdate) {
@@ -8754,7 +8757,7 @@
                 .set('Content-Type', 'application/json');
             var loadingToken = this.loadingService.register();
             var http$ = this.http.get(url, { headers: headers, observe: 'body' });
-            this.rxjsUtils.pipeTimeoutMechanismOn(http$, this.appConfig.getEnvironment(), this.appConfig.getCaseRetrievalTimeouts());
+            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$;
@@ -8965,12 +8968,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), i0__namespace.ɵɵinject(RxjsUtils)); };
+    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 }, { type: RxjsUtils }]; }, null);
+            }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: OrderService }, { type: HttpErrorService }, { type: WizardPageFieldToCaseFieldMapper }, { type: LoadingService }, { type: SessionStorageService }, { type: RetryUtil }]; }, null);
     })();
 
     var EventTriggerService = /** @class */ (function () {
@@ -11176,6 +11179,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();
         };
@@ -11447,6 +11454,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';
@@ -37687,6 +37701,7 @@
     exports.ReadYesNoFieldComponent = ReadYesNoFieldComponent;
     exports.RemoveDialogComponent = RemoveDialogComponent;
     exports.RequestOptionsBuilder = RequestOptionsBuilder;
+    exports.RetryUtil = RetryUtil;
     exports.RouterHelperService = RouterHelperService;
     exports.SaveOrDiscardDialogComponent = SaveOrDiscardDialogComponent;
     exports.SearchFiltersComponent = SearchFiltersComponent;