Merge branch 'master' into EXUI-705

hmcts · Aug 16, 2023 · cdc1665 · cdc1665
2 parents 384ae0f + 8452e8f
commit cdc1665
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "@angular/platform-browser-dynamic": "^11.2.14",
     "@angular/router": "^11.2.14",
     "@edium/fsm": "^2.1.2",
-    "@hmcts/ccd-case-ui-toolkit": "6.18.3-ConsoleLogs.1",
+    "@hmcts/ccd-case-ui-toolkit": "6.19.1-RetryCaseRetrievals.2",
     "@hmcts/ccpay-web-component": "5.2.8",
     "@hmcts/frontend": "0.0.39-alpha",
     "@hmcts/media-viewer": "2.9.3",

diff --git a/src/app/services/ccd-config/ccd-case.config.ts b/src/app/services/ccd-config/ccd-case.config.ts
@@ -131,6 +131,14 @@ export class AppConfig extends AbstractAppConfig {
     return this.config.activity_retry;
   }
 
+  public getTimeoutsForCaseRetrieval() {
+    return this.config.timeouts_case_retrieval;
+  }
+
+  public getTimeoutsCaseRetrievalArtificialDelay() {
+    return this.config.timeouts_case_retrieval_artificial_delay;
+  }
+
   public getActivityBatchCollectionDelayMs() {
     return this.config.activity_batch_collection_delay_ms;
   }

diff --git a/src/app/services/logger/logger.service.ts b/src/app/services/logger/logger.service.ts
@@ -40,6 +40,7 @@ export class LoggerService implements ILoggerService {
 
   private setupSwitcherForConsoleLogs() {
     this.environmentService.config$.subscribe((config) => {
+      console.info(`Environment is ${this.environmentService.isProd() ? 'prod' : 'non-prod'}.`);
       LoggerService.switchConsoleLogs({ switchOffAll: false });
     });
   }

diff --git a/src/assets/config/config.json b/src/assets/config/config.json
@@ -20,6 +20,10 @@
     "activity_batch_collection_delay_ms": 1,
     "activity_next_poll_request_ms": 30000,
     "activity_retry": 30,
+    "timeouts_case_retrieval": [
+      18
+    ],
+    "timeouts_case_retrieval_artificial_delay": 0,
     "activity_url": "/activity",
     "activity_max_request_per_batch": 25,
     "print_service_url": "/print",
@@ -49,4 +53,4 @@
       "oauthCallbackUrl": "oauth2/callback"
     }
   }
-}
+}
diff --git a/src/cases/cases.module.ts b/src/cases/cases.module.ts
@@ -42,7 +42,8 @@ import {
   RouterHelperService,
   SearchFiltersModule,
   SearchResultModule,
-  WorkbasketFiltersModule
+  WorkbasketFiltersModule,
+  RetryUtil
 } from '@hmcts/ccd-case-ui-toolkit';
 import { ExuiCommonLibModule } from '@hmcts/rpx-xui-common-lib';
 import { EffectsModule } from '@ngrx/effects';
@@ -106,6 +107,7 @@ import { effects, reducers } from './store';
     ErrorNotifierService,
     NavigationNotifierService,
     CasesService,
+    RetryUtil,
     CCDAuthService,
     HttpService,
     HttpErrorService,

diff --git a/src/cases/containers/case-create-submit/case-create-submit.component.spec.ts b/src/cases/containers/case-create-submit/case-create-submit.component.spec.ts
@@ -11,6 +11,7 @@ import {
   CaseEventTrigger,
   CaseField,
   CasesService,
+  RetryUtil,
   createCaseEventTrigger,
   DraftService,
   HttpErrorService,
@@ -34,9 +35,9 @@ import { CaseCreateSubmitComponent } from './case-create-submit.component';
 class MockSortService {
   public features = {};
   // eslint-disable-next-line @typescript-eslint/no-empty-function
-  public getFeatureToggle() {}
+  public getFeatureToggle() { }
   // eslint-disable-next-line @typescript-eslint/no-empty-function
-  public getEditorConfiguration() {}
+  public getEditorConfiguration() { }
 }
 
 const EVENT_TRIGGER: CaseEventTrigger = createCaseEventTrigger(
@@ -78,7 +79,7 @@ const SANITISED_EDIT_FORM: CaseEventData = {
   template: '<div></div>'
 })
 
-class FakeExuidCcdConnectorComponent {}
+class FakeExuidCcdConnectorComponent { }
 
 describe('CaseCreateSubmitComponent', () => {
   let component: CaseCreateSubmitComponent;
@@ -127,6 +128,7 @@ describe('CaseCreateSubmitComponent', () => {
           }
         },
         CasesService,
+        RetryUtil,
         CCDAuthService,
         DraftService,
         AlertService,

diff --git a/yarn.lock b/yarn.lock
@@ -2386,12 +2386,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hmcts/ccd-case-ui-toolkit@npm:6.18.3-ConsoleLogs.1":
-  version: 6.18.3-ConsoleLogs.1
-  resolution: "@hmcts/ccd-case-ui-toolkit@npm:6.18.3-ConsoleLogs.1"
+"@hmcts/ccd-case-ui-toolkit@npm:6.19.1-RetryCaseRetrievals.2":
+  version: 6.19.1-RetryCaseRetrievals.2
+  resolution: "@hmcts/ccd-case-ui-toolkit@npm:6.19.1-RetryCaseRetrievals.2"
   dependencies:
     tslib: ^2.0.0
-  checksum: b8612d60d8cd86303ef6ac126f99f4a00973133a5cf60fc8147120efa783a87b969ff2169163481cbd47c0387f17c44203041d9f046e4d36e789d25780626a45
+  checksum: bab9f194f43f1ba2dc60685d576a8460fbf07cb69d13945cd6f628bf377ded6886fd1760f319f35b4f1afd845a799cf562bbb0470c6d1df98aa223ffef6deff6
   languageName: node
   linkType: hard
 
@@ -19270,7 +19270,7 @@ __metadata:
     "@angular/platform-browser-dynamic": ^11.2.14
     "@angular/router": ^11.2.14
     "@edium/fsm": ^2.1.2
-    "@hmcts/ccd-case-ui-toolkit": 6.18.3-ConsoleLogs.1
+    "@hmcts/ccd-case-ui-toolkit": 6.19.1-RetryCaseRetrievals.2
     "@hmcts/ccpay-web-component": 5.2.8
     "@hmcts/frontend": 0.0.39-alpha
     "@hmcts/media-viewer": 2.9.3