@hmcts/ccd-case-ui-toolkit 7.0.11-manual-caseflag-lang → 7.0.11-orgs-cache-functionality

package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs

@@ -4534,6 +4534,7 @@ class Constants {
 }
 Constants.MANDATORY = 'MANDATORY';
 Constants.REGEX_WHITESPACES = '^[^ ]+(?:\\s+[^ ]+)*$';
+Constants.TASK_COMPLETION_ERROR = 'The associated task for this event failed to complete automatically. Please complete the task manually in the Tasks tab on the case';
 Constants.ɵfac = function Constants_Factory(t) { return new (t || Constants)(); };
 Constants.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: Constants, factory: Constants.ɵfac });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(Constants, [{
@@ -7257,14 +7258,11 @@ class OrganisationService {
             const url = this.appconfig.getPrdUrl();
             const cacheTimeOut = this.appconfig.getCacheTimeOut();
             this.organisations$ = this.http.get(url)
-                .pipe(map((orgs) => OrganisationService.mapOrganisation(orgs)), publishReplay(1), refCount(), take(1), catchError(e => {
+                .pipe(map((orgs) => OrganisationService.mapOrganisation(orgs)), publishReplay(1, cacheTimeOut), refCount(), take(1), catchError(e => {
                 console.log(e);
                 // Handle error and return blank Observable array
                 return of([]);
             }));
-            timer(cacheTimeOut).subscribe(() => {
-                this.organisations$ = null;
-            });
         }
         return this.organisations$;
     }
@@ -8656,7 +8654,7 @@ ValidPageListCaseFieldsService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({
     }], function () { return [{ type: FieldsUtils }]; }, null); })();
 
 class CaseEditComponent {
-    constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService, workAllocationService) {
+    constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService, workAllocationService, alertService) {
         this.fb = fb;
         this.caseNotifier = caseNotifier;
         this.router = router;
@@ -8672,6 +8670,7 @@ class CaseEditComponent {
         this.loadingService = loadingService;
         this.validPageListCaseFieldsService = validPageListCaseFieldsService;
         this.workAllocationService = workAllocationService;
+        this.alertService = alertService;
         this.cancelled = new EventEmitter();
         this.submitted = new EventEmitter();
         this.isEventCompletionChecksRequired = false;
@@ -8960,6 +8959,7 @@ class CaseEditComponent {
         const loadingSpinnerToken = this.loadingService.register();
         // keep the initial event response to finalise process after task completion
         let eventResponse;
+        this.sessionStorageService.setItem('taskCompletionError', 'false');
         submit(caseEventData).pipe(switchMap((response) => {
             eventResponse = response;
             return this.postCompleteTaskIfRequired();
@@ -8981,10 +8981,13 @@ class CaseEditComponent {
                 this.isSubmitting = false;
             }
             else {
+                this.sessionStorageService.setItem('taskCompletionError', 'true');
                 // task assignment/completion error - handled within workallocation service
                 // could set task to be deleted (or completed later)?
-                // note: think error messages only shown if user is caseworker - might reqauire changing
                 this.finishEventCompletionLogic(eventResponse);
+                // below allows error to be shown on navigation to confirmation page
+                this.alertService.setPreserveAlerts(true);
+                this.alertService.error({ phrase: Constants.TASK_COMPLETION_ERROR });
             }
         });
     }
@@ -9040,14 +9043,14 @@ class CaseEditComponent {
 }
 CaseEditComponent.ORIGIN_QUERY_PARAM = 'origin';
 CaseEditComponent.ALERT_MESSAGE = 'Page is being refreshed so you will be redirected to the first page of this event.';
-CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0.ɵɵdirectiveInject(i3.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FieldsUtils), i0.ɵɵdirectiveInject(FieldsPurger), i0.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0.ɵɵdirectiveInject(WizardFactoryService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WindowService), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService), i0.ɵɵdirectiveInject(WorkAllocationService)); };
+CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0.ɵɵdirectiveInject(i3.FormBuilder), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(FieldsUtils), i0.ɵɵdirectiveInject(FieldsPurger), i0.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0.ɵɵdirectiveInject(WizardFactoryService), i0.ɵɵdirectiveInject(SessionStorageService), i0.ɵɵdirectiveInject(WindowService), i0.ɵɵdirectiveInject(FormValueService), i0.ɵɵdirectiveInject(FormErrorService), i0.ɵɵdirectiveInject(LoadingService), i0.ɵɵdirectiveInject(ValidPageListCaseFieldsService), i0.ɵɵdirectiveInject(WorkAllocationService), i0.ɵɵdirectiveInject(AlertService)); };
 CaseEditComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEditComponent, selectors: [["ccd-case-edit"]], inputs: { eventTrigger: "eventTrigger", submit: "submit", validate: "validate", saveDraft: "saveDraft", caseDetails: "caseDetails" }, outputs: { cancelled: "cancelled", submitted: "submitted" }, features: [i0.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelement(0, "router-outlet");
     } }, dependencies: [i1$1.RouterOutlet], styles: ["#fieldset-case-data[_ngcontent-%COMP%]{margin-bottom:30px}#fieldset-case-data[_ngcontent-%COMP%]   th[_ngcontent-%COMP%]{width:1%;white-space:nowrap;vertical-align:top}.compound-field[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:0}#confirmation-header[_ngcontent-%COMP%]{width:630px;background-color:#17958b;border:solid 1px #979797;color:#fff;text-align:center}#confirmation-body[_ngcontent-%COMP%]{width:630px;background-color:#fff}.valign-top[_ngcontent-%COMP%]{vertical-align:top}.summary-fields[_ngcontent-%COMP%]{margin-bottom:30px}.summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   th[_ngcontent-%COMP%], .summary-fields[_ngcontent-%COMP%]   tbody[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{border-bottom:0px}a.disabled[_ngcontent-%COMP%]{pointer-events:none;cursor:default}.case-field-label[_ngcontent-%COMP%]{width:45%}.case-field-content[_ngcontent-%COMP%]{width:50%}.no-bottom-border[_ngcontent-%COMP%]{border-bottom:none}.case-field-change[_ngcontent-%COMP%]{width:5%}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEditComponent, [{
         type: Component,
         args: [{ selector: 'ccd-case-edit', providers: [GreyBarService], template: "<router-outlet></router-outlet>\n", styles: ["#fieldset-case-data{margin-bottom:30px}#fieldset-case-data th{width:1%;white-space:nowrap;vertical-align:top}.compound-field td{padding:0}#confirmation-header{width:630px;background-color:#17958b;border:solid 1px #979797;color:#fff;text-align:center}#confirmation-body{width:630px;background-color:#fff}.valign-top{vertical-align:top}.summary-fields{margin-bottom:30px}.summary-fields tbody tr th,.summary-fields tbody tr td{border-bottom:0px}a.disabled{pointer-events:none;cursor:default}.case-field-label{width:45%}.case-field-content{width:50%}.no-bottom-border{border-bottom:none}.case-field-change{width:5%}\n"] }]
-    }], function () { return [{ type: i3.FormBuilder }, { type: CaseNotifier }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }, { type: WorkAllocationService }]; }, { eventTrigger: [{
+    }], function () { return [{ type: i3.FormBuilder }, { type: CaseNotifier }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }, { type: WorkAllocationService }, { type: AlertService }]; }, { eventTrigger: [{
             type: Input
         }], submit: [{
             type: Input
@@ -11788,7 +11791,7 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         // Extract all flags-related data from the CaseEventTrigger object in the snapshot data
         if (this.route.snapshot.data.eventTrigger) {
             // Get the HMCTSServiceId from supplementary data, if it exists (required for retrieving the available flag types in
-            // the first instance, only falling back on case type ID or jurisdiction if it's not present)
+            // the first instance, only falling back on case type ID or jurisidiction if it's not present)
             if (this.route.snapshot.data.eventTrigger.supplementary_data
                 && this.route.snapshot.data.eventTrigger.supplementary_data.HMCTSServiceId) {
                 this.hmctsServiceId = this.route.snapshot.data.eventTrigger.supplementary_data.HMCTSServiceId;
@@ -12129,36 +12132,32 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
         this.flagCommentsOptional = true;
     }
     populateNewFlagDetailInstance() {
-        const langSearchTerm = this.caseFlagParentFormGroup?.value['languageSearchTerm'];
-        const manualLangEntry = this.caseFlagParentFormGroup?.value['manualLanguageEntry'];
-        const flagType = this.caseFlagParentFormGroup?.value['flagType'];
-        const otherDesc = this.caseFlagParentFormGroup?.value['otherDescription'];
         const formValues = this.caseFlagParentFormGroup?.value;
         return {
-            name: this.flagType?.name,
-            name_cy: flagType?.name_cy,
+            name: formValues?.flagType?.name,
+            name_cy: formValues?.flagType?.name_cy,
             // Currently, subTypeValue, subTypeValue_cy and subTypeKey are applicable only to language flag types
-            subTypeValue: langSearchTerm && this.rpxTranslationService.language === 'en'
-                ? langSearchTerm.value
-                : manualLangEntry && this.rpxTranslationService.language === 'en'
-                    ? manualLangEntry
+            subTypeValue: formValues?.languageSearchTerm && this.rpxTranslationService.language === 'en'
+                ? formValues?.languageSearchTerm.value
+                : formValues?.manualLanguageEntry && this.rpxTranslationService.language === 'en'
+                    ? formValues?.manualLanguageEntry
                     : null,
-            subTypeValue_cy: langSearchTerm && this.rpxTranslationService.language === 'cy'
-                ? langSearchTerm?.value_cy
-                : manualLangEntry && this.rpxTranslationService.language === 'cy'
-                    ? manualLangEntry
+            subTypeValue_cy: formValues?.languageSearchTerm && this.rpxTranslationService.language === 'cy'
+                ? formValues?.languageSearchTerm.value_cy
+                : formValues?.manualLanguageEntry && this.rpxTranslationService.language === 'cy'
+                    ? formValues?.manualLanguageEntry
                     : null,
             // For user-entered (i.e. non-Reference Data) languages, there is no key
-            subTypeKey: langSearchTerm
-                ? langSearchTerm.key
+            subTypeKey: formValues?.languageSearchTerm
+                ? formValues?.languageSearchTerm.key
                 : null,
-            otherDescription: flagType?.flagCode === this.otherFlagTypeCode &&
-                otherDesc && this.rpxTranslationService.language === 'en'
-                ? otherDesc
+            otherDescription: formValues?.flagType?.flagCode === this.otherFlagTypeCode &&
+                formValues?.otherDescription && this.rpxTranslationService.language === 'en'
+                ? formValues?.otherDescription
                 : null,
-            otherDescription_cy: flagType?.flagCode === this.otherFlagTypeCode &&
-                otherDesc && this.rpxTranslationService.language === 'cy'
-                ? otherDesc
+            otherDescription_cy: formValues?.flagType?.flagCode === this.otherFlagTypeCode &&
+                formValues?.otherDescription && this.rpxTranslationService.language === 'cy'
+                ? formValues?.otherDescription
                 : null,
             flagComment: this.rpxTranslationService.language === 'en'
                 ? formValues?.flagComments
@@ -12168,18 +12167,18 @@ class WriteCaseFlagFieldComponent extends AbstractFieldWriteComponent {
                 : null,
             flagUpdateComment: formValues?.statusReason,
             dateTimeCreated: new Date().toISOString(),
-            path: flagType?.Path &&
-                flagType?.Path.map(pathValue => Object.assign({ id: null, value: pathValue })),
-            hearingRelevant: flagType?.hearingRelevant ? 'Yes' : 'No',
-            flagCode: flagType?.flagCode,
+            path: formValues?.flagType?.Path &&
+                formValues?.flagType?.Path.map(pathValue => Object.assign({ id: null, value: pathValue })),
+            hearingRelevant: formValues?.flagType?.hearingRelevant ? 'Yes' : 'No',
+            flagCode: formValues?.flagType?.flagCode,
             // Status should be set to whatever the default is for this flag type, if flag is being created by an external
             // user, otherwise it should be set to "Active" if Case Flags v2.1 is NOT enabled, or the selected status if it is
             status: this.isDisplayContextParameterExternal
-                ? flagType?.defaultStatus
+                ? formValues?.flagType?.defaultStatus
                 : !this.isDisplayContextParameter2Point1Enabled
                     ? CaseFlagStatus.ACTIVE
                     : CaseFlagStatus[formValues?.selectedStatus],
-            availableExternally: flagType?.externallyAvailable ? 'Yes' : 'No'
+            availableExternally: formValues?.flagType?.externallyAvailable ? 'Yes' : 'No'
         };
     }
     moveToFinalReviewStage() {
@@ -30103,7 +30102,7 @@ function CaseEventTriggerComponent_div_0_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵproperty("caseDetails", ctx_r0.caseDetails)("submit", ctx_r0.submit())("validate", ctx_r0.validate())("eventTrigger", ctx_r0.eventTrigger);
 } }
 class CaseEventTriggerComponent {
-    constructor(ngZone, casesService, caseNotifier, router, alertService, route, caseReferencePipe, activityPollingService) {
+    constructor(ngZone, casesService, caseNotifier, router, alertService, route, caseReferencePipe, activityPollingService, sessionStorageService) {
         this.ngZone = ngZone;
         this.casesService = casesService;
         this.caseNotifier = caseNotifier;
@@ -30112,6 +30111,7 @@ class CaseEventTriggerComponent {
         this.route = route;
         this.caseReferencePipe = caseReferencePipe;
         this.activityPollingService = activityPollingService;
+        this.sessionStorageService = sessionStorageService;
         this.BANNER = DisplayMode.BANNER;
     }
     ngOnInit() {
@@ -30160,21 +30160,30 @@ class CaseEventTriggerComponent {
     }
     submitted(event) {
         const eventStatus = event['status'];
+        const taskCompletionFailed = this.sessionStorageService.getItem('taskCompletionError') === 'true';
         this.router
             .navigate([this.parentUrl])
             .then(() => {
             const caseReference = this.caseReferencePipe.transform(this.caseDetails.case_id.toString());
             const replacements = { CASEREFERENCE: caseReference, NAME: this.eventTrigger.name };
-            if (EventStatusService.isIncomplete(eventStatus)) {
+            this.alertService.setPreserveAlerts(true);
+            if (taskCompletionFailed) {
+                // if task still present in session storage, we know that the task has not been correctly completed
+                this.alertService.warning({
+                    phrase: CaseEventTriggerComponent.EVENT_COMPLETION_MESSAGE + '. ' + Constants.TASK_COMPLETION_ERROR,
+                    replacements
+                });
+                this.sessionStorageService.removeItem('taskCompletionError');
+            }
+            else if (EventStatusService.isIncomplete(eventStatus)) {
                 this.alertService.warning({
-                    phrase: `Case #%CASEREFERENCE% has been updated with event: %NAME%
-            but the callback service cannot be completed`,
+                    phrase: CaseEventTriggerComponent.EVENT_COMPLETION_MESSAGE + CaseEventTriggerComponent.CALLBACK_FAILED_MESSAGE,
                     replacements
                 });
             }
             else {
                 this.alertService.success({
-                    phrase: 'Case #%CASEREFERENCE% has been updated with event: %NAME%',
+                    phrase: CaseEventTriggerComponent.EVENT_COMPLETION_MESSAGE,
                     replacements,
                     preserve: true
                 });
@@ -30193,7 +30202,9 @@ class CaseEventTriggerComponent {
         return !!(this.eventTrigger && this.caseDetails);
     }
 }
-CaseEventTriggerComponent.ɵfac = function CaseEventTriggerComponent_Factory(t) { return new (t || CaseEventTriggerComponent)(i0.ɵɵdirectiveInject(i0.NgZone), i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseReferencePipe), i0.ɵɵdirectiveInject(ActivityPollingService)); };
+CaseEventTriggerComponent.EVENT_COMPLETION_MESSAGE = `Case #%CASEREFERENCE% has been updated with event: %NAME%`;
+CaseEventTriggerComponent.CALLBACK_FAILED_MESSAGE = ' but the callback service cannot be completed';
+CaseEventTriggerComponent.ɵfac = function CaseEventTriggerComponent_Factory(t) { return new (t || CaseEventTriggerComponent)(i0.ɵɵdirectiveInject(i0.NgZone), i0.ɵɵdirectiveInject(CasesService), i0.ɵɵdirectiveInject(CaseNotifier), i0.ɵɵdirectiveInject(i1$1.Router), i0.ɵɵdirectiveInject(AlertService), i0.ɵɵdirectiveInject(i1$1.ActivatedRoute), i0.ɵɵdirectiveInject(CaseReferencePipe), i0.ɵɵdirectiveInject(ActivityPollingService), i0.ɵɵdirectiveInject(SessionStorageService)); };
 CaseEventTriggerComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: CaseEventTriggerComponent, selectors: [["ccd-case-event-trigger"]], decls: 1, vars: 1, consts: [["class", "screen-990", 4, "ngIf"], [1, "screen-990"], [3, "caseId", "displayMode"], [3, "caseDetails", "submit", "validate", "eventTrigger", "cancelled", "submitted"]], template: function CaseEventTriggerComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵtemplate(0, CaseEventTriggerComponent_div_0_Template, 3, 6, "div", 0);
     } if (rf & 2) {
@@ -30202,7 +30213,7 @@ CaseEventTriggerComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: C
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseEventTriggerComponent, [{
         type: Component,
         args: [{ selector: 'ccd-case-event-trigger', template: "<div *ngIf=\"isDataLoaded()\" class=\"screen-990\">\n  <ccd-activity [caseId]=\"caseDetails.case_id\" [displayMode]=\"BANNER\"></ccd-activity>\n  <ccd-case-edit [caseDetails]=\"caseDetails\"\n                 [submit]=\"submit()\"\n                 [validate]=\"validate()\"\n                 [eventTrigger]=\"eventTrigger\"\n                 (cancelled)=\"cancel()\"\n                 (submitted)=\"submitted($event)\"></ccd-case-edit>\n</div>\n" }]
-    }], function () { return [{ type: i0.NgZone }, { type: CasesService }, { type: CaseNotifier }, { type: i1$1.Router }, { type: AlertService }, { type: i1$1.ActivatedRoute }, { type: CaseReferencePipe }, { type: ActivityPollingService }]; }, null); })();
+    }], function () { return [{ type: i0.NgZone }, { type: CasesService }, { type: CaseNotifier }, { type: i1$1.Router }, { type: AlertService }, { type: i1$1.ActivatedRoute }, { type: CaseReferencePipe }, { type: ActivityPollingService }, { type: SessionStorageService }]; }, null); })();
 
 function CaseViewComponent_div_0_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div");