@hmcts/ccd-case-ui-toolkit 6.10.7-manage-support-first-step-text-changes → 6.10.7-manage-case-flags-valid-status-progression

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

@@ -12802,7 +12802,7 @@
         };
         WriteCaseFlagFieldComponent.prototype.updateFlagInCollection = function () {
             var _this = this;
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             // Ensure no more than one flag is being updated at a time, by iterating through each Flags case field and resetting
             // the description, comments, status, and date/time modified (if present) for each entry in the details array, with
             // original values from the corresponding formatted_value property. (This scenario occurs if the user repeats the
@@ -12864,7 +12864,7 @@
                             ? (_b = this.caseFlagParentFormGroup.get(exports.CaseFlagFormFields.OTHER_FLAG_DESCRIPTION_WELSH)) === null || _b === void 0 ? void 0 : _b.value : null,
                         flagDetailToUpdate.value.flagComment = (_c = this.caseFlagParentFormGroup.get(exports.CaseFlagFormFields.COMMENTS)) === null || _c === void 0 ? void 0 : _c.value;
                     flagDetailToUpdate.value.flagComment_cy = (_d = this.caseFlagParentFormGroup.get(exports.CaseFlagFormFields.COMMENTS_WELSH)) === null || _d === void 0 ? void 0 : _d.value;
-                    flagDetailToUpdate.value.status = this.selectedFlag.flagDetailDisplay.flagDetail.status;
+                    flagDetailToUpdate.value.status = exports.CaseFlagStatus[(_e = this.caseFlagParentFormGroup.get(exports.CaseFlagFormFields.STATUS)) === null || _e === void 0 ? void 0 : _e.value];
                     flagDetailToUpdate.value.dateTimeModified = new Date().toISOString();
                 }
             }
@@ -20351,6 +20351,7 @@
             this.selectedControlName = 'selectedManageCaseLocation';
             this.updateMode = '#ARGUMENT(UPDATE)';
             this.updateExternalMode = '#ARGUMENT(UPDATE,EXTERNAL)';
+            this.excludedFlagStatuses = [exports.CaseFlagStatus.INACTIVE, exports.CaseFlagStatus.NOT_APPROVED];
         }
         ManageCaseFlagsComponent.prototype.ngOnInit = function () {
             var _this = this;
@@ -20359,10 +20360,16 @@
             if (this.flagsData) {
                 this.flagsDisplayData = this.flagsData.reduce(function (displayData, flagsInstance) {
                     if (flagsInstance.flags.details && flagsInstance.flags.details.length > 0) {
-                        displayData = __spread(displayData, flagsInstance.flags.details.map(function (detail) { return _this.mapFlagDetailForDisplay(detail, flagsInstance); }));
+                        displayData = __spread(displayData, flagsInstance.flags.details.map(function (detail) {
+                            // Only map flags instances where the status is neither "Inactive" nor "Not approved"
+                            // This will result in some undefined mappings, which need to be filtered out after the reduce operation
+                            if (!_this.excludedFlagStatuses.includes(detail.status)) {
+                                return _this.mapFlagDetailForDisplay(detail, flagsInstance);
+                            }
+                        }));
                     }
                     return displayData;
-                }, []);
+                }, []).filter(function (flagDetailDisplay) { return !!flagDetailDisplay; });
                 this.flagsDisplayData.forEach(function (flagDisplayData) {
                     flagDisplayData.label = _this.processLabel(flagDisplayData);
                 });
@@ -20596,10 +20603,10 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", ctx_r2.caseFlagFormFields.STATUS + "_" + status_r5);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", status_r5, " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r2.caseFlagStatusEnum[status_r5], " ");
         }
     }
-    function UpdateFlagComponent_div_27_Template(rf, ctx) {
+    function UpdateFlagComponent_div_26_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 35);
             i0__namespace.ɵɵelementStart(1, "span", 30);
@@ -20614,7 +20621,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", ctx_r3.statusReasonNotEnteredErrorMessage, " ");
         }
     }
-    function UpdateFlagComponent_div_28_Template(rf, ctx) {
+    function UpdateFlagComponent_div_27_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 36);
             i0__namespace.ɵɵelementStart(1, "span", 30);
@@ -20640,22 +20647,39 @@
             this.statusReasonNotEnteredErrorMessage = null;
             this.statusReasonCharLimitErrorMessage = null;
             this.updateFlagStepEnum = exports.UpdateFlagStep;
-            this.caseFlagStatuses = exports.CaseFlagStatus;
+            this.caseFlagStatusEnum = exports.CaseFlagStatus;
             this.caseFlagFormFields = exports.CaseFlagFormFields;
             this.textMaxCharLimit = 200;
         }
         UpdateFlagComponent.prototype.ngOnInit = function () {
+            var _this = this;
             if (this.selectedFlag && this.selectedFlag.flagDetailDisplay && this.selectedFlag.flagDetailDisplay.flagDetail) {
                 this.flagDetail = this.selectedFlag.flagDetailDisplay.flagDetail;
+                var currentFlagStatusKey = Object.keys(exports.CaseFlagStatus).find(function (key) { return exports.CaseFlagStatus[key] === _this.flagDetail.status; });
                 // Populate flag comments text area with existing comments
                 this.formGroup.addControl(exports.CaseFlagFormFields.COMMENTS, new i1$2.FormControl(this.flagDetail.flagComment));
-                this.formGroup.addControl(exports.CaseFlagFormFields.STATUS, new i1$2.FormControl(this.flagDetail.status));
+                this.formGroup.addControl(exports.CaseFlagFormFields.STATUS, new i1$2.FormControl(currentFlagStatusKey));
                 this.formGroup.addControl(exports.CaseFlagFormFields.STATUS_CHANGE_REASON, new i1$2.FormControl(''));
                 this.formGroup.addControl(exports.CaseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED, new i1$2.FormControl(false));
                 if (this.flagDetail.name) {
                     this.updateFlagTitle =
                         exports.CaseFlagWizardStepTitle.UPDATE_FLAG_TITLE + " \"" + this.flagDetail.name + (this.flagDetail.subTypeValue ? ", " + this.flagDetail.subTypeValue + "\"" : '"');
                 }
+                // Set the valid status options for display, based on current status of the selected flag. "Active" flags can
+                // remain "Active" or move to "Inactive" only; "Requested" flags can remain "Requested" or move to "Active",
+                // "Inactive", or "Not approved". No other status progressions are valid
+                if (currentFlagStatusKey) {
+                    switch (currentFlagStatusKey) {
+                        case 'ACTIVE':
+                            this.validStatusProgressions = Object.keys(exports.CaseFlagStatus).filter(function (key) { return !['REQUESTED', 'NOT_APPROVED'].includes(key); });
+                            break;
+                        case 'REQUESTED':
+                            this.validStatusProgressions = Object.keys(exports.CaseFlagStatus);
+                            break;
+                        default:
+                            this.validStatusProgressions = [];
+                    }
+                }
             }
         };
         UpdateFlagComponent.prototype.onNext = function () {
@@ -20696,7 +20720,8 @@
                 });
             }
             var statusReason = this.formGroup.get(exports.CaseFlagFormFields.STATUS_CHANGE_REASON).value;
-            if (this.formGroup.get(exports.CaseFlagFormFields.STATUS).value === exports.CaseFlagStatus.NOT_APPROVED && !statusReason) {
+            var flagStatusNotApprovedKey = Object.keys(exports.CaseFlagStatus).find(function (key) { return exports.CaseFlagStatus[key] === exports.CaseFlagStatus.NOT_APPROVED; });
+            if (this.formGroup.get(exports.CaseFlagFormFields.STATUS).value === flagStatusNotApprovedKey && !statusReason) {
                 this.statusReasonNotEnteredErrorMessage = exports.UpdateFlagErrorMessage.STATUS_REASON_NOT_ENTERED;
                 this.errorMessages.push({
                     title: '',
@@ -20716,7 +20741,7 @@
         return UpdateFlagComponent;
     }());
     UpdateFlagComponent.ɵfac = function UpdateFlagComponent_Factory(t) { return new (t || UpdateFlagComponent)(); };
-    UpdateFlagComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: UpdateFlagComponent, selectors: [["ccd-update-flag"]], inputs: { formGroup: "formGroup", selectedFlag: "selectedFlag" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter" }, decls: 42, vars: 30, consts: [[3, "formGroup"], ["data-module", "govuk-character-count", "data-maxlength", "200", 1, "govuk-character-count"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper", "govuk-!-margin-bottom-6"], [1, "govuk-label", "govuk-label--l"], [1, "govuk-!-margin-bottom-4"], [1, "govuk-label", "govuk-label--s", 3, "for"], ["id", "update-flag-hint", 1, "govuk-hint"], ["id", "update-flag-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "update-flag-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", "aria-describedby", "update-flag-hint update-flag-char-limit-info update-flag-char-limit-error", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "update-flag-comments-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], ["aria-describedby", "update-flag-status-heading", 1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--s"], ["id", "update-flag-status-heading", 1, "govuk-fieldset__heading"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--conditional", "govuk-!-margin-bottom-4", 3, "id"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf"], ["id", "update-flag-status-hint", 1, "govuk-hint"], ["id", "update-flag-status-reason-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "update-flag-status-reason-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "update-flag-status-reason-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], [1, "govuk-!-margin-bottom-6"], ["data-module", "govuk-checkboxes", 1, "govuk-checkboxes"], [1, "govuk-checkboxes__item"], ["type", "checkbox", 1, "govuk-checkboxes__input", 3, "formControlName", "id", "name"], [1, "govuk-label", "govuk-checkboxes__label", 3, "for"], [1, "govuk-button-group"], ["id", "updateFlagNextButton", "type", "button", 1, "govuk-button", 3, "click"], ["id", "update-flag-not-entered-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "update-flag-char-limit-error", 1, "govuk-error-message"], [1, "govuk-radios__item"], ["type", "radio", 1, "govuk-radios__input", 3, "id", "name", "formControlName", "value"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["id", "update-flag-status-reason-not-entered-error-message", 1, "govuk-error-message"], ["id", "update-flag-status-reason-char-limit-error", 1, "govuk-error-message"]], template: function UpdateFlagComponent_Template(rf, ctx) {
+    UpdateFlagComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: UpdateFlagComponent, selectors: [["ccd-update-flag"]], inputs: { formGroup: "formGroup", selectedFlag: "selectedFlag" }, outputs: { caseFlagStateEmitter: "caseFlagStateEmitter" }, decls: 41, vars: 28, consts: [[3, "formGroup"], ["data-module", "govuk-character-count", "data-maxlength", "200", 1, "govuk-character-count"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper", "govuk-!-margin-bottom-6"], [1, "govuk-label", "govuk-label--l"], [1, "govuk-!-margin-bottom-4"], [1, "govuk-label", "govuk-label--s", 3, "for"], ["id", "update-flag-hint", 1, "govuk-hint"], ["id", "update-flag-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "update-flag-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", "aria-describedby", "update-flag-hint update-flag-char-limit-info update-flag-char-limit-error", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "update-flag-comments-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], ["aria-describedby", "update-flag-status-heading", 1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--s"], ["id", "update-flag-status-heading", 1, "govuk-fieldset__heading"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--conditional", "govuk-!-margin-bottom-4", 3, "id"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf"], ["id", "update-flag-status-hint", 1, "govuk-hint"], ["id", "update-flag-status-reason-not-entered-error-message", "class", "govuk-error-message", 4, "ngIf"], ["id", "update-flag-status-reason-char-limit-error", "class", "govuk-error-message", 4, "ngIf"], ["rows", "5", 1, "govuk-textarea", 3, "id", "name", "formControlName"], ["id", "update-flag-status-reason-char-limit-info", "aria-live", "polite", 1, "govuk-hint", "govuk-character-count__message"], [1, "govuk-!-margin-bottom-6"], ["data-module", "govuk-checkboxes", 1, "govuk-checkboxes"], [1, "govuk-checkboxes__item"], ["type", "checkbox", 1, "govuk-checkboxes__input", 3, "formControlName", "id", "name"], [1, "govuk-label", "govuk-checkboxes__label", 3, "for"], [1, "govuk-button-group"], ["id", "updateFlagNextButton", "type", "button", 1, "govuk-button", 3, "click"], ["id", "update-flag-not-entered-error-message", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "update-flag-char-limit-error", 1, "govuk-error-message"], [1, "govuk-radios__item"], ["type", "radio", 1, "govuk-radios__input", 3, "id", "name", "formControlName", "value"], [1, "govuk-label", "govuk-radios__label", 3, "for"], ["id", "update-flag-status-reason-not-entered-error-message", 1, "govuk-error-message"], ["id", "update-flag-status-reason-char-limit-error", 1, "govuk-error-message"]], template: function UpdateFlagComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementContainerStart(0, 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
@@ -20751,27 +20776,26 @@
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementStart(22, "div", 15);
                 i0__namespace.ɵɵtemplate(23, UpdateFlagComponent_div_23_Template, 4, 6, "div", 16);
-                i0__namespace.ɵɵpipe(24, "enumDisplayDescription");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(25, "div", 17);
-                i0__namespace.ɵɵtext(26);
+                i0__namespace.ɵɵelementStart(24, "div", 17);
+                i0__namespace.ɵɵtext(25);
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(27, UpdateFlagComponent_div_27_Template, 4, 1, "div", 18);
-                i0__namespace.ɵɵtemplate(28, UpdateFlagComponent_div_28_Template, 4, 1, "div", 19);
-                i0__namespace.ɵɵelementStart(29, "textarea", 20);
-                i0__namespace.ɵɵtext(30, "        ");
+                i0__namespace.ɵɵtemplate(26, UpdateFlagComponent_div_26_Template, 4, 1, "div", 18);
+                i0__namespace.ɵɵtemplate(27, UpdateFlagComponent_div_27_Template, 4, 1, "div", 19);
+                i0__namespace.ɵɵelementStart(28, "textarea", 20);
+                i0__namespace.ɵɵtext(29, "        ");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(31, "div", 21);
-                i0__namespace.ɵɵtext(32);
+                i0__namespace.ɵɵelementStart(30, "div", 21);
+                i0__namespace.ɵɵtext(31);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(33, "div", 22);
-                i0__namespace.ɵɵelementStart(34, "div", 23);
-                i0__namespace.ɵɵelementStart(35, "div", 24);
-                i0__namespace.ɵɵelement(36, "input", 25);
-                i0__namespace.ɵɵelementStart(37, "label", 26);
-                i0__namespace.ɵɵtext(38, " I need to add a translation ");
+                i0__namespace.ɵɵelementStart(32, "div", 22);
+                i0__namespace.ɵɵelementStart(33, "div", 23);
+                i0__namespace.ɵɵelementStart(34, "div", 24);
+                i0__namespace.ɵɵelement(35, "input", 25);
+                i0__namespace.ɵɵelementStart(36, "label", 26);
+                i0__namespace.ɵɵtext(37, " I need to add a translation ");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -20779,17 +20803,17 @@
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementContainerEnd();
-                i0__namespace.ɵɵelementStart(39, "div", 27);
-                i0__namespace.ɵɵelementStart(40, "button", 28);
-                i0__namespace.ɵɵlistener("click", function UpdateFlagComponent_Template_button_click_40_listener() { return ctx.onNext(); });
-                i0__namespace.ɵɵtext(41, " Next ");
+                i0__namespace.ɵɵelementStart(38, "div", 27);
+                i0__namespace.ɵɵelementStart(39, "button", 28);
+                i0__namespace.ɵɵlistener("click", function UpdateFlagComponent_Template_button_click_39_listener() { return ctx.onNext(); });
+                i0__namespace.ɵɵtext(40, " Next ");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(28, _c0$n, ctx.errorMessages.length > 0));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(26, _c0$n, ctx.errorMessages.length > 0));
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵtextInterpolate1(" ", ctx.updateFlagTitle, " ");
                 i0__namespace.ɵɵadvance(2);
@@ -20811,8 +20835,8 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("id", ctx.caseFlagFormFields.STATUS);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(24, 26, ctx.caseFlagStatuses));
-                i0__namespace.ɵɵadvance(3);
+                i0__namespace.ɵɵproperty("ngForOf", ctx.validStatusProgressions);
+                i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵtextInterpolate1(" ", ctx.updateFlagStepEnum.STATUS_HINT_TEXT, " ");
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.statusReasonNotEnteredErrorMessage);
@@ -20827,7 +20851,7 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("for", ctx.caseFlagFormFields.IS_WELSH_TRANSLATION_NEEDED);
             }
-        }, directives: [i1__namespace$3.NgControlStatusGroup, i1__namespace$3.FormGroupDirective, i1__namespace.NgClass, i1__namespace.NgIf, i1__namespace$3.DefaultValueAccessor, i1__namespace$3.NgControlStatus, i1__namespace$3.FormControlName, i1__namespace.NgForOf, i1__namespace$3.CheckboxControlValueAccessor, i1__namespace$3.RadioControlValueAccessor], pipes: [EnumDisplayDescriptionPipe], encapsulation: 2 });
+        }, directives: [i1__namespace$3.NgControlStatusGroup, i1__namespace$3.FormGroupDirective, i1__namespace.NgClass, i1__namespace.NgIf, i1__namespace$3.DefaultValueAccessor, i1__namespace$3.NgControlStatus, i1__namespace$3.FormControlName, i1__namespace.NgForOf, i1__namespace$3.CheckboxControlValueAccessor, i1__namespace$3.RadioControlValueAccessor], encapsulation: 2 });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(UpdateFlagComponent, [{
                 type: i0.Component,