@hmcts/ccd-case-ui-toolkit 6.19.5-secure-doc-case-creation.1 → 6.19.6-case-file-view-document-upload-date

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

@@ -3501,6 +3501,20 @@
         return Alert;
     }());
 
+    // tslint:disable:variable-name
+    var CaseDetails = /** @class */ (function () {
+        function CaseDetails() {
+        }
+        return CaseDetails;
+    }());
+
+    // tslint:disable:variable-name
+    var CaseEventData = /** @class */ (function () {
+        function CaseEventData() {
+        }
+        return CaseEventData;
+    }());
+
     var WizardPageField = /** @class */ (function () {
         function WizardPageField() {
         }
@@ -3920,6 +3934,20 @@
         return FormDocument;
     }());
 
+    var DRAFT_PREFIX = 'DRAFT';
+    var DRAFT_QUERY_PARAM = 'draft';
+    var Draft = /** @class */ (function () {
+        function Draft() {
+        }
+        Draft.stripDraftId = function (draftId) {
+            return draftId.slice(DRAFT_PREFIX.length);
+        };
+        Draft.isDraft = function (id) {
+            return String(id).startsWith(DRAFT_PREFIX);
+        };
+        return Draft;
+    }());
+
     var OrganisationConverter = /** @class */ (function () {
         function OrganisationConverter() {
         }
@@ -3965,6 +3993,12 @@
             }], null, null);
     })();
 
+    var PaginationMetadata = /** @class */ (function () {
+        function PaginationMetadata() {
+        }
+        return PaginationMetadata;
+    }());
+
     function hasRoles(profile) {
         if (profile.user && profile.user.idam && Array.isArray(profile.user.idam.roles)) {
             return profile.user.idam.roles.length > 0;
@@ -4023,20 +4057,6 @@
         __metadata("design:type", Array)
     ], SearchResultViewItem.prototype, "hydrated_case_fields", void 0);
 
-    var DRAFT_PREFIX = 'DRAFT';
-    var DRAFT_QUERY_PARAM = 'draft';
-    var Draft = /** @class */ (function () {
-        function Draft() {
-        }
-        Draft.stripDraftId = function (draftId) {
-            return draftId.slice(DRAFT_PREFIX.length);
-        };
-        Draft.isDraft = function (id) {
-            return String(id).startsWith(DRAFT_PREFIX);
-        };
-        return Draft;
-    }());
-
     // @dynamic
     var SearchResultView = /** @class */ (function () {
         function SearchResultView() {
@@ -4057,19 +4077,20 @@
         __metadata("design:type", Array)
     ], SearchResultView.prototype, "results", void 0);
 
-    // tslint:disable:variable-name
-    var CaseDetails = /** @class */ (function () {
-        function CaseDetails() {
+    var SortParameters = /** @class */ (function () {
+        function SortParameters(comparator, sortOrder) {
+            this.comparator = comparator;
+            this.sortOrder = sortOrder;
         }
-        return CaseDetails;
+        return SortParameters;
     }());
 
-    // tslint:disable:variable-name
-    var CaseEventData = /** @class */ (function () {
-        function CaseEventData() {
-        }
-        return CaseEventData;
-    }());
+    exports.SortOrder = void 0;
+    (function (SortOrder) {
+        SortOrder[SortOrder["ASCENDING"] = 0] = "ASCENDING";
+        SortOrder[SortOrder["DESCENDING"] = 1] = "DESCENDING";
+        SortOrder[SortOrder["UNSORTED"] = 2] = "UNSORTED";
+    })(exports.SortOrder || (exports.SortOrder = {}));
 
     var WorkbasketInputModel = /** @class */ (function () {
         function WorkbasketInputModel() {
@@ -4082,27 +4103,6 @@
         return WorkbasketInput;
     }());
 
-    var PaginationMetadata = /** @class */ (function () {
-        function PaginationMetadata() {
-        }
-        return PaginationMetadata;
-    }());
-
-    exports.SortOrder = void 0;
-    (function (SortOrder) {
-        SortOrder[SortOrder["ASCENDING"] = 0] = "ASCENDING";
-        SortOrder[SortOrder["DESCENDING"] = 1] = "DESCENDING";
-        SortOrder[SortOrder["UNSORTED"] = 2] = "UNSORTED";
-    })(exports.SortOrder || (exports.SortOrder = {}));
-
-    var SortParameters = /** @class */ (function () {
-        function SortParameters(comparator, sortOrder) {
-            this.comparator = comparator;
-            this.sortOrder = sortOrder;
-        }
-        return SortParameters;
-    }());
-
     // @dynamic
     var FieldsUtils = /** @class */ (function () {
         function FieldsUtils() {
@@ -7275,6 +7275,239 @@
             }], function () { return [{ type: i1__namespace$1.Router }, { type: i1__namespace.RpxTranslationService }]; }, null);
     })();
 
+    var categoriesAndDocumentsTestData = {
+        case_version: 1,
+        categories: [
+            {
+                category_id: 'Beers',
+                category_name: 'Beers',
+                category_order: 1,
+                documents: [
+                    {
+                        document_url: '/test',
+                        document_filename: 'Lager encyclopedia',
+                        document_binary_url: '/test/binary',
+                        attribute_path: '',
+                        upload_timestamp: new Date(2023, 4, 11),
+                        content_type: ''
+                    },
+                    {
+                        document_url: '/test',
+                        document_filename: 'Beers encyclopedia',
+                        document_binary_url: '/test/binary',
+                        attribute_path: '',
+                        upload_timestamp: new Date(2023, 3, 14),
+                        content_type: ''
+                    },
+                    {
+                        document_url: '/test',
+                        document_filename: 'Ale encyclopedia',
+                        document_binary_url: '/test/binary',
+                        attribute_path: '',
+                        upload_timestamp: new Date(2023, 2, 12),
+                        content_type: ''
+                    }
+                ],
+                sub_categories: [
+                    {
+                        category_id: 'BeersBitters',
+                        category_name: 'Bitters',
+                        category_order: 1,
+                        documents: [],
+                        sub_categories: []
+                    },
+                    {
+                        category_id: 'BeersAmerican',
+                        category_name: 'American',
+                        category_order: 2,
+                        documents: [],
+                        sub_categories: []
+                    },
+                    {
+                        category_id: 'BeersAsian',
+                        category_name: 'Asian',
+                        category_order: 3,
+                        documents: [],
+                        sub_categories: []
+                    }
+                ]
+            },
+            {
+                category_id: 'Wines',
+                category_name: 'Wines',
+                category_order: 2,
+                documents: [],
+                sub_categories: [
+                    {
+                        category_id: 'WinesFrench',
+                        category_name: 'French',
+                        category_order: 1,
+                        documents: [],
+                        sub_categories: []
+                    },
+                    {
+                        category_id: 'WinesItalian',
+                        category_name: 'Italian',
+                        category_order: 2,
+                        documents: [
+                            {
+                                document_url: '/red-wine',
+                                document_filename: 'Details about red wine',
+                                document_binary_url: '/test/binary',
+                                attribute_path: '',
+                                upload_timestamp: null,
+                                content_type: ''
+                            },
+                            {
+                                document_url: '/white-wine',
+                                document_filename: 'Details about white wine',
+                                document_binary_url: '/test/binary',
+                                attribute_path: '',
+                                upload_timestamp: new Date(2023, 1, 10),
+                                content_type: ''
+                            },
+                            {
+                                document_url: '/prosecco',
+                                document_filename: 'Details about Prosecco',
+                                document_binary_url: '/test/binary',
+                                attribute_path: '',
+                                upload_timestamp: new Date(2023, 3, 12),
+                                content_type: ''
+                            },
+                            {
+                                document_url: '/pinot-grigio',
+                                document_filename: 'Details about Pinot Grigio',
+                                document_binary_url: '/test/binary',
+                                attribute_path: '',
+                                upload_timestamp: new Date(2023, 2, 16),
+                                content_type: ''
+                            }
+                        ],
+                        sub_categories: []
+                    }
+                ]
+            },
+            {
+                category_id: 'Spirits',
+                category_name: 'Spirits',
+                category_order: 3,
+                documents: [],
+                sub_categories: [
+                    {
+                        category_id: 'SpiritsWhisky',
+                        category_name: 'Scotch whisky',
+                        category_order: 1,
+                        documents: [],
+                        sub_categories: [
+                            {
+                                category_id: 'WhiskyHighland',
+                                category_name: 'Highland',
+                                category_order: 1,
+                                documents: [],
+                                sub_categories: [
+                                    {
+                                        category_id: 'WhiskyHighland1',
+                                        category_name: 'Highland 1',
+                                        category_order: 1,
+                                        documents: [],
+                                        sub_categories: []
+                                    }
+                                ]
+                            },
+                            {
+                                category_id: 'WhiskyLowland',
+                                category_name: 'Lowland',
+                                category_order: 2,
+                                documents: [],
+                                sub_categories: [
+                                    {
+                                        category_id: 'WhiskyLowland1',
+                                        category_name: 'Lowland 1',
+                                        category_order: 1,
+                                        documents: [
+                                            {
+                                                document_url: '/test',
+                                                document_filename: 'Details about Whisky Lowland 1',
+                                                document_binary_url: '/test/binary',
+                                                attribute_path: '',
+                                                upload_timestamp: new Date(2022, 5, 21),
+                                                content_type: ''
+                                            }
+                                        ],
+                                        sub_categories: []
+                                    },
+                                    {
+                                        category_id: 'WhiskyLowland2',
+                                        category_name: 'Lowland 2',
+                                        category_order: 2,
+                                        documents: [],
+                                        sub_categories: []
+                                    }
+                                ]
+                            },
+                            {
+                                category_id: 'WhiskyIslay',
+                                category_name: 'Islay',
+                                category_order: 3,
+                                documents: [
+                                    {
+                                        document_url: '/test',
+                                        document_filename: 'Details about Whisky Islay',
+                                        document_binary_url: '/test/binary',
+                                        attribute_path: '',
+                                        upload_timestamp: new Date(2022, 10, 4),
+                                        content_type: ''
+                                    },
+                                    {
+                                        document_url: '/test',
+                                        document_filename: 'More information about Whisky Islay',
+                                        document_binary_url: '/test/binary',
+                                        attribute_path: '',
+                                        upload_timestamp: new Date(2022, 11, 28),
+                                        content_type: ''
+                                    }
+                                ],
+                                sub_categories: []
+                            },
+                            {
+                                category_id: 'WhiskySpeyside',
+                                category_name: 'Speyside',
+                                category_order: 4,
+                                documents: [],
+                                sub_categories: []
+                            },
+                            {
+                                category_id: 'WhiskyCampbeltown',
+                                category_name: 'Campbeltown',
+                                category_order: 5,
+                                documents: [],
+                                sub_categories: []
+                            }
+                        ]
+                    }
+                ]
+            }
+        ],
+        uncategorised_documents: [
+            {
+                document_url: '/uncategorised-document-1',
+                document_filename: 'Uncategorised document 1',
+                document_binary_url: '/test/binary',
+                attribute_path: '',
+                upload_timestamp: new Date(2022, 10, 17),
+                content_type: ''
+            },
+            {
+                document_url: '/uncategorised-document-2',
+                document_filename: 'Uncategorised document 2',
+                document_binary_url: '/test/binary',
+                attribute_path: '',
+                upload_timestamp: new Date(2023, 1, 23),
+                content_type: ''
+            }
+        ]
+    };
+
     var CaseFileViewService = /** @class */ (function () {
         function CaseFileViewService(http, appConfig) {
             this.http = http;
@@ -7287,6 +7520,16 @@
          * @returns An `Observable` of the `CategoriesAndDocuments` for the case
          */
         CaseFileViewService.prototype.getCategoriesAndDocuments = function (caseRef) {
+            // Case file view v1.1 epic - https://tools.hmcts.net/jira/browse/EUI-7807
+            // Display upload_timestamp - https://tools.hmcts.net/jira/browse/EUI-7819
+            // Sort by upload_timestamp - https://tools.hmcts.net/jira/browse/EUI-7812
+            // The property upload_timestamp is not available as it is not yet implemented by CCD
+            // Using this case reference '1666863124102280' to return the mock data with upload_timestamp
+            // The below 'if' statement should be removed once the upload_timestamp property is made available by CCD
+            // https://tools.hmcts.net/jira/browse/EUI-8129
+            if (caseRef === '1666863124102280') {
+                return rxjs.of(categoriesAndDocumentsTestData);
+            }
             var url = this.appConfig.getCategoriesAndDocumentsUrl();
             if (url) {
                 url += "/" + caseRef;
@@ -7708,7 +7951,6 @@
             return this.httpService.get('/aggregated/caseworkers/:uid/jurisdictions?access=read');
         };
         JurisdictionService.prototype.announceSelectedJurisdiction = function (jurisdiction) {
-            console.info('Announcing selected jurisdiction = ' + (jurisdiction === null || jurisdiction === void 0 ? void 0 : jurisdiction.id));
             this.selectedJurisdictionSource.next(jurisdiction);
             this.selectedJurisdictionBS.next(jurisdiction);
         };
@@ -9374,23 +9616,16 @@
             this.cachedCaseView = null;
         };
         CaseNotifier.prototype.announceCase = function (c) {
-            console.info('announceCase started.');
             this.caseViewSource.next(c);
-            console.info('announceCase finished.');
         };
         CaseNotifier.prototype.fetchAndRefresh = function (cid) {
             var _this = this;
-            console.info('fetchAndRefresh started.');
             return this.casesService
                 .getCaseViewV2(cid)
                 .pipe(operators.map(function (caseView) {
-                console.info('mapping caseView started.');
-                // this.casesService.syncWait(10);
-                // throw new Error('******************************************************');
                 _this.cachedCaseView = classTransformer.plainToClassFromExist(new CaseView(), caseView);
                 _this.setBasicFields(_this.cachedCaseView.tabs);
                 _this.announceCase(_this.cachedCaseView);
-                console.info('mapping caseView finished. Returning it.');
                 return _this.cachedCaseView;
             }));
         };
@@ -9892,8 +10127,38 @@
             }], function () { return [{ type: HttpService }, { type: AbstractAppConfig }, { type: HttpErrorService }, { type: AlertService }, { type: SessionStorageService }]; }, null);
     })();
 
+    var ValidPageListCaseFieldsService = /** @class */ (function () {
+        function ValidPageListCaseFieldsService() {
+        }
+        ValidPageListCaseFieldsService.prototype.deleteNonValidatedFields = function (validPageList, data, notFromEventSubmit, fromPreviousPage) {
+            if (fromPreviousPage === void 0) { fromPreviousPage = false; }
+            var validPageListCaseFields = [];
+            validPageList.forEach(function (page) {
+                if (notFromEventSubmit || ShowCondition.getInstance(page.show_condition).match(data)) {
+                    page.case_fields.forEach(function (field) { return validPageListCaseFields.push(field); });
+                }
+            });
+            if (!fromPreviousPage && validPageListCaseFields.length > 0) {
+                Object.keys(data).forEach(function (key) {
+                    if (validPageListCaseFields.findIndex(function (element) { return element.id === key; }) < 0) {
+                        delete data[key];
+                        ;
+                    }
+                });
+            }
+        };
+        return ValidPageListCaseFieldsService;
+    }());
+    ValidPageListCaseFieldsService.ɵfac = function ValidPageListCaseFieldsService_Factory(t) { return new (t || ValidPageListCaseFieldsService)(); };
+    ValidPageListCaseFieldsService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: ValidPageListCaseFieldsService, factory: ValidPageListCaseFieldsService.ɵfac });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ValidPageListCaseFieldsService, [{
+                type: i0.Injectable
+            }], null, null);
+    })();
+
     var CaseEditComponent = /** @class */ (function () {
-        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService) {
+        function CaseEditComponent(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService) {
             this.fb = fb;
             this.caseNotifier = caseNotifier;
             this.router = router;
@@ -9907,6 +10172,7 @@
             this.formValueService = formValueService;
             this.formErrorService = formErrorService;
             this.loadingService = loadingService;
+            this.validPageListCaseFieldsService = validPageListCaseFieldsService;
             this.cancelled = new i0.EventEmitter();
             this.submitted = new i0.EventEmitter();
             this.isEventCompletionChecksRequired = false;
@@ -9914,6 +10180,7 @@
             this.ignoreWarning = false;
             this.isLinkedCasesSubmission = false;
             this.callbackErrorsSubject = new rxjs.Subject();
+            this.validPageList = [];
         }
         CaseEditComponent.prototype.ngOnInit = function () {
             var _this = this;
@@ -10078,6 +10345,8 @@
             this.formValueService.populateLinkedCasesDetailsFromCaseFields(caseEventData.data, eventTrigger.case_fields);
             // Remove "Launcher"-type fields (these have no values and are not intended to be persisted)
             this.formValueService.removeCaseFieldsOfType(caseEventData.data, eventTrigger.case_fields, ['FlagLauncher', 'ComponentLauncher']);
+            // delete fields which are not part of the case event journey wizard pages case fields
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.validPageList, caseEventData.data, false);
             caseEventData.event_token = eventTrigger.event_token;
             caseEventData.ignore_warning = this.ignoreWarning;
             if (this.confirmation) {
@@ -10179,7 +10448,9 @@
                             rawFormValueData[key] = parentField.formatted_value[caseField.id];
                         }
                         else {
-                            rawFormValueData[key] = caseField.formatted_value;
+                            if (!(caseField.hidden && caseField.retain_hidden_value)) {
+                                rawFormValueData[key] = caseField.formatted_value;
+                            }
                         }
                     }
                 }
@@ -10245,7 +10516,7 @@
     }());
     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__namespace.ɵɵdirectiveInject(i2__namespace$1.FormBuilder), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(FieldsPurger), i0__namespace.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0__namespace.ɵɵdirectiveInject(WizardFactoryService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(WindowService), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(LoadingService)); };
+    CaseEditComponent.ɵfac = function CaseEditComponent_Factory(t) { return new (t || CaseEditComponent)(i0__namespace.ɵɵdirectiveInject(i2__namespace$1.FormBuilder), i0__namespace.ɵɵdirectiveInject(CaseNotifier), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FieldsUtils), i0__namespace.ɵɵdirectiveInject(FieldsPurger), i0__namespace.ɵɵdirectiveInject(ConditionalShowRegistrarService), i0__namespace.ɵɵdirectiveInject(WizardFactoryService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(WindowService), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(LoadingService), i0__namespace.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
     CaseEditComponent.ɵcmp = i0__namespace.ɵɵ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__namespace.ɵɵProvidersFeature([GreyBarService])], decls: 1, vars: 0, template: function CaseEditComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelement(0, "router-outlet");
@@ -10260,7 +10531,7 @@
                         styleUrls: ['../case-edit.scss'],
                         providers: [GreyBarService]
                     }]
-            }], function () { return [{ type: i2__namespace$1.FormBuilder }, { type: CaseNotifier }, { type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }]; }, { eventTrigger: [{
+            }], function () { return [{ type: i2__namespace$1.FormBuilder }, { type: CaseNotifier }, { type: i1__namespace$1.Router }, { type: i1__namespace$1.ActivatedRoute }, { type: FieldsUtils }, { type: FieldsPurger }, { type: ConditionalShowRegistrarService }, { type: WizardFactoryService }, { type: SessionStorageService }, { type: WindowService }, { type: FormValueService }, { type: FormErrorService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, { eventTrigger: [{
                     type: i0.Input
                 }], submit: [{
                     type: i0.Input
@@ -10956,7 +11227,7 @@
         }
     }
     var CaseEditPageComponent = /** @class */ (function () {
-        function CaseEditPageComponent(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService) {
+        function CaseEditPageComponent(caseEdit, route, formValueService, formErrorService, cdRef, pageValidationService, dialog, caseFieldService, caseEditDataService, loadingService, validPageListCaseFieldsService) {
             this.caseEdit = caseEdit;
             this.route = route;
             this.formValueService = formValueService;
@@ -10967,6 +11238,7 @@
             this.caseFieldService = caseFieldService;
             this.caseEditDataService = caseEditDataService;
             this.loadingService = loadingService;
+            this.validPageListCaseFieldsService = validPageListCaseFieldsService;
             this.triggerTextStart = CaseEditPageComponent.TRIGGER_TEXT_START;
             this.triggerTextIgnoreWarnings = CaseEditPageComponent.TRIGGER_TEXT_CONTINUE;
             this.formValuesChanged = false;
@@ -11177,6 +11449,9 @@
                 }
             }
             if (!this.caseEdit.isSubmitting && !this.currentPageIsNotValid()) {
+                if (this.caseEdit.validPageList.findIndex(function (page) { return page.id === _this.currentPage.id; }) === -1) {
+                    this.caseEdit.validPageList.push(this.currentPage);
+                }
                 this.caseEdit.isSubmitting = true;
                 this.caseEdit.error = null;
                 var caseEventData = this.buildCaseEventData();
@@ -11445,6 +11720,8 @@
             this.formValueService.sanitiseDynamicLists(caseFields, formFields);
             // Get hold of the CaseEventData.
             var caseEventData = this.formValueService.sanitise(formFields);
+            // delete fields which are not part of the case event journey wizard pages case fields
+            this.validPageListCaseFieldsService.deleteNonValidatedFields(this.caseEdit.validPageList, caseEventData.data, true, fromPreviousPage);
             // Tidy it up before we return it.
             this.formValueService.removeUnnecessaryFields(caseEventData.data, caseFields, clearEmpty, clearNonCase, fromPreviousPage, this.currentPage.case_fields);
             return caseEventData;
@@ -11487,7 +11764,7 @@
     CaseEditPageComponent.TRIGGER_TEXT_START = 'Continue';
     CaseEditPageComponent.TRIGGER_TEXT_SAVE = 'Save and continue';
     CaseEditPageComponent.TRIGGER_TEXT_CONTINUE = 'Ignore Warning and Continue';
-    CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(PageValidationService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService), i0__namespace.ɵɵdirectiveInject(LoadingService)); };
+    CaseEditPageComponent.ɵfac = function CaseEditPageComponent_Factory(t) { return new (t || CaseEditPageComponent)(i0__namespace.ɵɵdirectiveInject(CaseEditComponent), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.ActivatedRoute), i0__namespace.ɵɵdirectiveInject(FormValueService), i0__namespace.ɵɵdirectiveInject(FormErrorService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(PageValidationService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog), i0__namespace.ɵɵdirectiveInject(CaseFieldService), i0__namespace.ɵɵdirectiveInject(CaseEditDataService), i0__namespace.ɵɵdirectiveInject(LoadingService), i0__namespace.ɵɵdirectiveInject(ValidPageListCaseFieldsService)); };
     CaseEditPageComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseEditPageComponent, selectors: [["ccd-case-edit-page"]], decls: 12, vars: 11, consts: [[4, "ngIf"], [4, "ngIf", "ngIfThen", "ngIfElse"], ["titleBlock", ""], ["idBlock", ""], ["class", "govuk-error-summary", "aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 4, "ngIf"], [3, "error"], [3, "triggerTextContinue", "triggerTextIgnore", "callbackErrorsSubject", "callbackErrorsContext"], [1, "width-50"], ["class", "form", 3, "formGroup", "submit", 4, "ngIf"], [3, "eventCompletionParams", "eventCanBeCompleted", 4, "ngIf"], ["class", "govuk-heading-l", 4, "ngIf"], [1, "govuk-heading-l"], [1, "govuk-caption-l"], [3, "content"], ["class", "heading-h2", 4, "ngIf"], [1, "heading-h2"], ["aria-labelledby", "error-summary-title", "role", "alert", "tabindex", "-1", "data-module", "govuk-error-summary", 1, "govuk-error-summary"], ["id", "error-summary-title", 1, "govuk-error-summary__title"], ["class", "govuk-error-summary__body", 4, "ngFor", "ngForOf"], [1, "govuk-error-summary__body"], [1, "govuk-list", "govuk-error-summary__list"], [1, "validation-error", 3, "click"], [1, "form", 3, "formGroup", "submit"], ["id", "fieldset-case-data"], [2, "display", "none"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged", 4, "ngIf"], ["class", "grid-row", 4, "ngIf"], [1, "form-group", "form-group-related"], ["type", "button", 1, "button", "button-secondary", 3, "disabled", "click"], ["type", "submit", 1, "button", 3, "disabled"], [1, "cancel"], ["href", "javascript:void(0)", 3, "click"], ["id", "caseEditForm", 3, "fields", "formGroup", "caseFields", "pageChangeSubject", "valuesChanged"], [1, "grid-row"], [1, "column-two-thirds", "rightBorderSeparator"], ["id", "caseEditForm1", 3, "fields", "formGroup", "caseFields"], [1, "column-one-third"], ["id", "caseEditForm2", 3, "fields", "formGroup", "caseFields"], [3, "eventCompletionParams", "eventCanBeCompleted"]], template: function CaseEditPageComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, CaseEditPageComponent_ng_container_0_Template, 3, 2, "ng-container", 0);
@@ -11530,7 +11807,7 @@
                         templateUrl: 'case-edit-page.html',
                         styleUrls: ['./case-edit-page.scss']
                     }]
-            }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }]; }, null);
+            }], function () { return [{ type: CaseEditComponent }, { type: i1__namespace$1.ActivatedRoute }, { type: FormValueService }, { type: FormErrorService }, { type: i0__namespace.ChangeDetectorRef }, { type: PageValidationService }, { type: i1__namespace$3.MatDialog }, { type: CaseFieldService }, { type: CaseEditDataService }, { type: LoadingService }, { type: ValidPageListCaseFieldsService }]; }, null);
     })();
 
     var CallbackErrorsContext = /** @class */ (function () {
@@ -14657,7 +14934,6 @@
         };
         WriteDocumentFieldComponent.prototype.ngOnInit = function () {
             this.secureModeOn = this.appConfig.getDocumentSecureMode();
-            console.info('writeDocumentField.ngInit: secure mode = ' + this.secureModeOn);
             if (this.secureModeOn) {
                 this.subscribeToCaseDetails();
             }
@@ -14786,7 +15062,6 @@
                     var _a, _b;
                     _this.caseTypeId = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.case_id;
                     _this.jurisdictionId = (_b = (_a = caseDetails === null || caseDetails === void 0 ? void 0 : caseDetails.case_type) === null || _a === void 0 ? void 0 : _a.jurisdiction) === null || _b === void 0 ? void 0 : _b.id;
-                    console.info("caseNotifier.next: caseType=" + _this.caseTypeId + " juris=" + _this.jurisdictionId);
                 }
             });
             this.jurisdictionSubs = this.jurisdictionService.selectedJurisdictionBS.subscribe({
@@ -14797,7 +15072,6 @@
                             _this.caseTypeId = jurisdiction.currentCaseType.id;
                         }
                     }
-                    console.info("selectedJurisdiction.next: caseType=" + _this.caseTypeId + " juris=" + _this.jurisdictionId);
                 }
             });
         };
@@ -16425,12 +16699,24 @@
             }
         };
         WriteJudicialUserFieldComponent.prototype.setJurisdictionAndCaseType = function () {
+            var _this = this;
             var caseInfoStr = this.sessionStorageService.getItem('caseInfo');
             if (caseInfoStr) {
                 var caseInfo = JSON.parse(caseInfoStr);
                 this.jurisdiction = caseInfo === null || caseInfo === void 0 ? void 0 : caseInfo.jurisdiction;
                 this.caseType = caseInfo === null || caseInfo === void 0 ? void 0 : caseInfo.caseType;
             }
+            else {
+                // If there is no case info, attempt to get the current jurisdiction and case type via the JurisdictionService
+                this.jurisdictionSubscription = this.jurisdictionService.selectedJurisdictionBS.subscribe(function (jurisdiction) {
+                    if (jurisdiction) {
+                        _this.jurisdiction = jurisdiction.id;
+                        if (jurisdiction.currentCaseType) {
+                            _this.caseType = jurisdiction.currentCaseType.id;
+                        }
+                    }
+                });
+            }
         };
         WriteJudicialUserFieldComponent.prototype.displayJudicialUser = function (judicialUser) {
             return judicialUser
@@ -16476,6 +16762,10 @@
                 this.judicialUserControl.setValidators(i2$1.Validators.required);
             }
         };
+        WriteJudicialUserFieldComponent.prototype.ngOnDestroy = function () {
+            var _a;
+            (_a = this.jurisdictionSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        };
         return WriteJudicialUserFieldComponent;
     }(WriteComplexFieldComponent));
     WriteJudicialUserFieldComponent.ɵfac = function WriteJudicialUserFieldComponent_Factory(t) { return new (t || WriteJudicialUserFieldComponent)(i0__namespace.ɵɵdirectiveInject(JurisdictionService), i0__namespace.ɵɵdirectiveInject(SessionStorageService), i0__namespace.ɵɵdirectiveInject(CaseFlagRefdataService), i0__namespace.ɵɵdirectiveInject(IsCompoundPipe), i0__namespace.ɵɵdirectiveInject(FormValidatorsService)); };
@@ -21912,6 +22202,12 @@
                 }] });
     })();
 
+    var CaseFileViewSortColumns;
+    (function (CaseFileViewSortColumns) {
+        CaseFileViewSortColumns[CaseFileViewSortColumns["DOCUMENT_NAME"] = 0] = "DOCUMENT_NAME";
+        CaseFileViewSortColumns[CaseFileViewSortColumns["DOCUMENT_UPLOAD_TIMESTAMP"] = 1] = "DOCUMENT_UPLOAD_TIMESTAMP";
+    })(CaseFileViewSortColumns || (CaseFileViewSortColumns = {}));
+
     var CaseFileViewFolderSortComponent = /** @class */ (function () {
         function CaseFileViewFolderSortComponent() {
             var _this = this;
@@ -21919,8 +22215,10 @@
             this.sortAscending = new i0.EventEmitter();
             this.sortDescending = new i0.EventEmitter();
             this.overlayMenuItems = [
-                { actionText: 'A to Z ascending', iconSrc: '/assets/img/sort/sort-down-arrow.svg', actionFn: function () { return _this.sortAscending.emit(); } },
-                { actionText: 'Z to A descending', iconSrc: '/assets/img/sort/sort-up-arrow.svg', actionFn: function () { return _this.sortDescending.emit(); } },
+                { actionText: 'A to Z ascending', iconSrc: '/assets/img/sort/sort-down-arrow.svg', actionFn: function () { return _this.sortAscending.emit(CaseFileViewSortColumns.DOCUMENT_NAME); } },
+                { actionText: 'Z to A descending', iconSrc: '/assets/img/sort/sort-up-arrow.svg', actionFn: function () { return _this.sortDescending.emit(CaseFileViewSortColumns.DOCUMENT_NAME); } },
+                { actionText: 'Recent first', iconSrc: '/assets/img/sort/sort-down-arrow.svg', actionFn: function () { return _this.sortDescending.emit(CaseFileViewSortColumns.DOCUMENT_UPLOAD_TIMESTAMP); } },
+                { actionText: 'Oldest first', iconSrc: '/assets/img/sort/sort-up-arrow.svg', actionFn: function () { return _this.sortAscending.emit(CaseFileViewSortColumns.DOCUMENT_UPLOAD_TIMESTAMP); } },
             ];
         }
         return CaseFileViewFolderSortComponent;
@@ -22004,48 +22302,56 @@
             enumerable: false,
             configurable: true
         });
-        DocumentTreeNode.prototype.sortChildrenAscending = function () {
+        DocumentTreeNode.prototype.sortChildrenAscending = function (column, sortOrder) {
+            var _this = this;
             var _a, _b;
             var sortAscending = function () {
                 return function (a, b) {
-                    var nameA = a.name.toUpperCase();
-                    var nameB = b.name.toUpperCase();
+                    var nodeA = _this.getNodeToSort(a, column, sortOrder);
+                    var nodeB = _this.getNodeToSort(b, column, sortOrder);
                     if (a.type === DocumentTreeNodeType.FOLDER || b.type === DocumentTreeNodeType.FOLDER) {
                         return 0;
                     }
-                    if (nameA < nameB) {
+                    if (!nodeA || !nodeB) {
+                        return 0;
+                    }
+                    if (nodeA < nodeB) {
                         return -1;
                     }
-                    if (nameA > nameB) {
+                    if (nodeA > nodeB) {
                         return 1;
                     }
                 };
             };
             (_a = this.children) === null || _a === void 0 ? void 0 : _a.sort(sortAscending());
             (_b = this.children) === null || _b === void 0 ? void 0 : _b.forEach(function (childNodes) {
-                childNodes.sortChildrenAscending();
+                childNodes.sortChildrenAscending(column, sortOrder);
             });
         };
-        DocumentTreeNode.prototype.sortChildrenDescending = function () {
+        DocumentTreeNode.prototype.sortChildrenDescending = function (column, sortOrder) {
+            var _this = this;
             var _a, _b;
             var sortDescending = function () {
                 return function (a, b) {
-                    var nameA = a.name.toUpperCase();
-                    var nameB = b.name.toUpperCase();
+                    var nodeA = _this.getNodeToSort(a, column, sortOrder);
+                    var nodeB = _this.getNodeToSort(b, column, sortOrder);
                     if (a.type === DocumentTreeNodeType.FOLDER || b.type === DocumentTreeNodeType.FOLDER) {
                         return 0;
                     }
-                    if (nameA > nameB) {
+                    if (!nodeA || !nodeB) {
+                        return 0;
+                    }
+                    if (nodeA > nodeB) {
                         return -1;
                     }
-                    if (nameA < nameB) {
+                    if (nodeA < nodeB) {
                         return 1;
                     }
                 };
             };
             (_a = this.children) === null || _a === void 0 ? void 0 : _a.sort(sortDescending());
             (_b = this.children) === null || _b === void 0 ? void 0 : _b.forEach(function (childNodes) {
-                childNodes.sortChildrenDescending();
+                childNodes.sortChildrenDescending(column, sortOrder);
             });
         };
         Object.defineProperty(DocumentTreeNode.prototype, "flattenedAll", {
@@ -22071,6 +22377,24 @@
             enumerable: false,
             configurable: true
         });
+        DocumentTreeNode.prototype.getNodeToSort = function (node, column, sortOrder) {
+            if (column === CaseFileViewSortColumns.DOCUMENT_NAME) {
+                return (node === null || node === void 0 ? void 0 : node.name) ? node.name.toUpperCase()
+                    : '';
+            }
+            if (column === CaseFileViewSortColumns.DOCUMENT_UPLOAD_TIMESTAMP) {
+                if (node === null || node === void 0 ? void 0 : node.upload_timestamp) {
+                    return new Date(node.upload_timestamp);
+                }
+                if (sortOrder === exports.SortOrder.ASCENDING) {
+                    return new Date(9999, 12, 31);
+                }
+                if (sortOrder === exports.SortOrder.DESCENDING) {
+                    return new Date(1111, 1, 1);
+                }
+            }
+            return '';
+        };
         return DocumentTreeNode;
     }());
     __decorate([
@@ -22101,10 +22425,14 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(4, "span", 16);
             i0__namespace.ɵɵtext(5);
+            i0__namespace.ɵɵelement(6, "br");
+            i0__namespace.ɵɵelementStart(7, "span", 17);
+            i0__namespace.ɵɵtext(8);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(6, "div", 17);
-            i0__namespace.ɵɵelementStart(7, "ccd-case-file-view-folder-document-actions", 18);
-            i0__namespace.ɵɵlistener("changeFolderAction", function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template_ccd_case_file_view_folder_document_actions_changeFolderAction_7_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var node_r4 = ctx.$implicit; var ctx_r7 = i0__namespace.ɵɵnextContext(2); return ctx_r7.triggerDocumentAction("changeFolder", node_r4); })("openInANewTabAction", function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template_ccd_case_file_view_folder_document_actions_openInANewTabAction_7_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var node_r4 = ctx.$implicit; var ctx_r8 = i0__namespace.ɵɵnextContext(2); return ctx_r8.triggerDocumentAction("openInANewTab", node_r4); })("downloadAction", function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template_ccd_case_file_view_folder_document_actions_downloadAction_7_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var node_r4 = ctx.$implicit; var ctx_r9 = i0__namespace.ɵɵnextContext(2); return ctx_r9.triggerDocumentAction("download", node_r4); })("printAction", function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template_ccd_case_file_view_folder_document_actions_printAction_7_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var node_r4 = ctx.$implicit; var ctx_r10 = i0__namespace.ɵɵnextContext(2); return ctx_r10.triggerDocumentAction("print", node_r4); });
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementStart(9, "div", 18);
+            i0__namespace.ɵɵelementStart(10, "ccd-case-file-view-folder-document-actions", 19);
+            i0__namespace.ɵɵlistener("changeFolderAction", function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template_ccd_case_file_view_folder_document_actions_changeFolderAction_10_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var node_r4 = ctx.$implicit; var ctx_r7 = i0__namespace.ɵɵnextContext(2); return ctx_r7.triggerDocumentAction("changeFolder", node_r4); })("openInANewTabAction", function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template_ccd_case_file_view_folder_document_actions_openInANewTabAction_10_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var node_r4 = ctx.$implicit; var ctx_r8 = i0__namespace.ɵɵnextContext(2); return ctx_r8.triggerDocumentAction("openInANewTab", node_r4); })("downloadAction", function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template_ccd_case_file_view_folder_document_actions_downloadAction_10_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var node_r4 = ctx.$implicit; var ctx_r9 = i0__namespace.ɵɵnextContext(2); return ctx_r9.triggerDocumentAction("download", node_r4); })("printAction", function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template_ccd_case_file_view_folder_document_actions_printAction_10_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var node_r4 = ctx.$implicit; var ctx_r10 = i0__namespace.ɵɵnextContext(2); return ctx_r10.triggerDocumentAction("print", node_r4); });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -22116,27 +22444,29 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵclassProp("node--selected", (ctx_r2.selectedNodeItem == null ? null : ctx_r2.selectedNodeItem.name) === node_r4.name);
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(node_r4.name);
+            i0__namespace.ɵɵtextInterpolate1(" ", node_r4.name, " ");
+            i0__namespace.ɵɵadvance(3);
+            i0__namespace.ɵɵtextInterpolate(node_r4.upload_timestamp);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("allowMoving", ctx_r2.allowMoving);
         }
     }
     function CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_5_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "cdk-nested-tree-node", 19);
-            i0__namespace.ɵɵelementStart(1, "button", 20);
-            i0__namespace.ɵɵelementStart(2, "div", 21);
-            i0__namespace.ɵɵelement(3, "img", 22);
-            i0__namespace.ɵɵelementStart(4, "span", 23);
+            i0__namespace.ɵɵelementStart(0, "cdk-nested-tree-node", 20);
+            i0__namespace.ɵɵelementStart(1, "button", 21);
+            i0__namespace.ɵɵelementStart(2, "div", 22);
+            i0__namespace.ɵɵelement(3, "img", 23);
+            i0__namespace.ɵɵelementStart(4, "span", 24);
             i0__namespace.ɵɵtext(5);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(6, "span", 24);
+            i0__namespace.ɵɵelementStart(6, "span", 25);
             i0__namespace.ɵɵtext(7);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(8, "div");
-            i0__namespace.ɵɵelementContainer(9, 25);
+            i0__namespace.ɵɵelementContainer(9, 26);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
@@ -22161,7 +22491,7 @@
             i0__namespace.ɵɵtemplate(1, CaseFileViewFolderComponent_div_8_div_1_Template, 2, 0, "div", 8);
             i0__namespace.ɵɵelementStart(2, "div");
             i0__namespace.ɵɵelementStart(3, "cdk-tree", 9);
-            i0__namespace.ɵɵtemplate(4, CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template, 8, 4, "cdk-nested-tree-node", 10);
+            i0__namespace.ɵɵtemplate(4, CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_4_Template, 11, 5, "cdk-nested-tree-node", 10);
             i0__namespace.ɵɵtemplate(5, CaseFileViewFolderComponent_div_8_cdk_nested_tree_node_5_Template, 10, 6, "cdk-nested-tree-node", 11);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -22256,6 +22586,7 @@
                 documentTreeNode.document_filename = document.document_filename;
                 documentTreeNode.document_binary_url = document.document_binary_url;
                 documentTreeNode.attribute_path = document.attribute_path;
+                documentTreeNode.upload_timestamp = document.upload_timestamp ? moment__namespace(document.upload_timestamp).format('DD MMM YYYY') : '';
                 documentsToReturn.push(documentTreeNode);
             });
             return documentsToReturn;
@@ -22269,6 +22600,7 @@
                 documentTreeNode.document_filename = document.document_filename;
                 documentTreeNode.document_binary_url = document.document_binary_url;
                 documentTreeNode.attribute_path = document.attribute_path;
+                documentTreeNode.upload_timestamp = document.upload_timestamp ? moment__namespace(document.upload_timestamp).format('DD MMM YYYY') : '';
                 documents.push(documentTreeNode);
             });
             var uncategorisedNode = new DocumentTreeNode();
@@ -22323,16 +22655,16 @@
                     return;
             }
         };
-        CaseFileViewFolderComponent.prototype.sortDataSourceAscAlphabetically = function () {
+        CaseFileViewFolderComponent.prototype.sortDataSourceAscending = function (column) {
             var sortedData = this.nestedDataSource.map(function (item) {
-                item.sortChildrenAscending();
+                item.sortChildrenAscending(column, exports.SortOrder.ASCENDING);
                 return item;
             });
             this.updateNodeData(sortedData);
         };
-        CaseFileViewFolderComponent.prototype.sortDataSourceDescAlphabetically = function () {
+        CaseFileViewFolderComponent.prototype.sortDataSourceDescending = function (column) {
             var sortedData = this.nestedDataSource.map(function (item) {
-                item.sortChildrenDescending();
+                item.sortChildrenDescending(column, exports.SortOrder.DESCENDING);
                 return item;
             });
             this.updateNodeData(sortedData);
@@ -22393,7 +22725,7 @@
     CaseFileViewFolderComponent.DOCUMENT_SEARCH_FORM_CONTROL_NAME = 'documentSearchFormControl';
     CaseFileViewFolderComponent.MINIMUM_SEARCH_CHARACTERS = 1;
     CaseFileViewFolderComponent.ɵfac = function CaseFileViewFolderComponent_Factory(t) { return new (t || CaseFileViewFolderComponent)(i0__namespace.ɵɵdirectiveInject(WindowService), i0__namespace.ɵɵdirectiveInject(i1__namespace$1.Router), i0__namespace.ɵɵdirectiveInject(DocumentManagementService), i0__namespace.ɵɵdirectiveInject(i1__namespace$3.MatDialog)); };
-    CaseFileViewFolderComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFileViewFolderComponent, selectors: [["ccd-case-file-view-folder"]], inputs: { categoriesAndDocuments: "categoriesAndDocuments", allowMoving: "allowMoving" }, outputs: { clickedDocument: "clickedDocument", moveDocument: "moveDocument" }, decls: 9, vars: 3, consts: [[1, "document-filter-container"], [1, "form-group", "document-filter", 3, "formGroup"], ["type", "search", "id", "document-search", "name", "documentSearchFormControl", "formControlName", "documentSearchFormControl", "placeholder", "Search by document name", 1, "form-control", "document-search"], [1, "document-folders-header"], [1, "document-folders-header__title"], [3, "sortAscending", "sortDescending"], ["class", "document-tree-container", 4, "ngIf"], [1, "document-tree-container"], [4, "ngIf"], [3, "dataSource", "treeControl"], ["class", "document-tree-container__node document-tree-container__node--document", 4, "cdkTreeNodeDef"], ["class", "document-tree-container__node document-tree-container__folder", 4, "cdkTreeNodeDef", "cdkTreeNodeDefWhen"], [1, "document-tree-container__node", "document-tree-container__node--document"], [1, "node", 3, "click"], ["disabled", "", 1, "node__icon"], ["src", "/assets/img/case-file-view/case-file-view-document.svg", "alt", "Document icon", 1, "node__iconImg"], [1, "node__name", "node-name-document"], [1, "node__document-options"], [3, "allowMoving", "changeFolderAction", "openInANewTabAction", "downloadAction", "printAction"], [1, "document-tree-container__node", "document-tree-container__folder"], ["cdkTreeNodeToggle", "", 1, "node"], [1, "node__icon"], ["alt", "Folder icon", 1, "node__iconImg", 3, "src"], [1, "node__count"], [1, "node__name", "node__name--folder"], ["cdkTreeNodeOutlet", ""]], template: function CaseFileViewFolderComponent_Template(rf, ctx) {
+    CaseFileViewFolderComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFileViewFolderComponent, selectors: [["ccd-case-file-view-folder"]], inputs: { categoriesAndDocuments: "categoriesAndDocuments", allowMoving: "allowMoving" }, outputs: { clickedDocument: "clickedDocument", moveDocument: "moveDocument" }, decls: 9, vars: 3, consts: [[1, "document-filter-container"], [1, "form-group", "document-filter", 3, "formGroup"], ["type", "search", "id", "document-search", "name", "documentSearchFormControl", "formControlName", "documentSearchFormControl", "placeholder", "Search by document name", 1, "form-control", "document-search"], [1, "document-folders-header"], [1, "document-folders-header__title"], [3, "sortAscending", "sortDescending"], ["class", "document-tree-container", 4, "ngIf"], [1, "document-tree-container"], [4, "ngIf"], [3, "dataSource", "treeControl"], ["class", "document-tree-container__node document-tree-container__node--document", 4, "cdkTreeNodeDef"], ["class", "document-tree-container__node document-tree-container__folder", 4, "cdkTreeNodeDef", "cdkTreeNodeDefWhen"], [1, "document-tree-container__node", "document-tree-container__node--document"], [1, "node", 3, "click"], ["disabled", "", 1, "node__icon"], ["src", "/assets/img/case-file-view/case-file-view-document.svg", "alt", "Document icon", 1, "node__iconImg"], [1, "node__name", "node-name-document"], [1, "node__document-upload-timestamp"], [1, "node__document-options"], [3, "allowMoving", "changeFolderAction", "openInANewTabAction", "downloadAction", "printAction"], [1, "document-tree-container__node", "document-tree-container__folder"], ["cdkTreeNodeToggle", "", 1, "node"], [1, "node__icon"], ["alt", "Folder icon", 1, "node__iconImg", 3, "src"], [1, "node__count"], [1, "node__name", "node__name--folder"], ["cdkTreeNodeOutlet", ""]], template: function CaseFileViewFolderComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
@@ -22406,7 +22738,7 @@
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementStart(6, "div");
                 i0__namespace.ɵɵelementStart(7, "ccd-case-file-view-folder-sort", 5);
-                i0__namespace.ɵɵlistener("sortAscending", function CaseFileViewFolderComponent_Template_ccd_case_file_view_folder_sort_sortAscending_7_listener() { return ctx.sortDataSourceAscAlphabetically(); })("sortDescending", function CaseFileViewFolderComponent_Template_ccd_case_file_view_folder_sort_sortDescending_7_listener() { return ctx.sortDataSourceDescAlphabetically(); });
+                i0__namespace.ɵɵlistener("sortAscending", function CaseFileViewFolderComponent_Template_ccd_case_file_view_folder_sort_sortAscending_7_listener($event) { return ctx.sortDataSourceAscending($event); })("sortDescending", function CaseFileViewFolderComponent_Template_ccd_case_file_view_folder_sort_sortDescending_7_listener($event) { return ctx.sortDataSourceDescending($event); });
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -22420,7 +22752,7 @@
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("ngIf", ctx.documentTreeData);
             }
-        }, directives: [i2__namespace$1.NgControlStatusGroup, i2__namespace$1.FormGroupDirective, i2__namespace$1.DefaultValueAccessor, i2__namespace$1.NgControlStatus, i2__namespace$1.FormControlName, CaseFileViewFolderSortComponent, i2__namespace.NgIf, i7__namespace.CdkTree, i7__namespace.CdkTreeNodeDef, i7__namespace.CdkNestedTreeNode, CaseFileViewFolderDocumentActionsComponent, i7__namespace.CdkTreeNodeToggle, i7__namespace.CdkTreeNodeOutlet], styles: ["[_nghost-%COMP%]{display:flex;height:100%;flex-direction:column}[_nghost-%COMP%]   .document-tree-container[_ngcontent-%COMP%]{flex:1 0}.document-filter-container[_ngcontent-%COMP%]{border-bottom:2px solid #c9c9c9}.document-filter-container[_ngcontent-%COMP%]   .document-filter[_ngcontent-%COMP%]{padding:10px}.document-filter-container[_ngcontent-%COMP%]   .document-filter[_ngcontent-%COMP%]   .document-search[_ngcontent-%COMP%]{background:url(/assets/images/icon-search-black.svg) no-repeat 100% #fff;background-position-x:calc(100% - 4px);padding-right:30px;width:100%}.document-filter-container[_ngcontent-%COMP%]   .documents-title[_ngcontent-%COMP%]{height:30%;margin-left:8px;font-weight:700}.document-tree-container[_ngcontent-%COMP%]{padding:4px;overflow-x:hidden;overflow-y:scroll}.document-tree-container__node[_ngcontent-%COMP%]{display:block}.document-tree-container__node[_ngcontent-%COMP%]   .document-tree-container__node[_ngcontent-%COMP%]{padding-left:40px}.document-tree-container[_ngcontent-%COMP%]   .document-tree-invisible[_ngcontent-%COMP%]{display:none}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar{width:7px}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar-thumb{border:4px solid transparent;background-clip:padding-box;border-radius:9999px;background-color:#aaa}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar-button{display:none}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar-track-piece{background:#eee}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar-thumb{background:#ccc}.document-folders-header[_ngcontent-%COMP%]{display:flex;align-items:center;justify-content:space-between;border-bottom:2px solid #c9c9c9;padding:10px}.document-folders-header__title[_ngcontent-%COMP%]{font-weight:700}.node[_ngcontent-%COMP%]{display:flex;align-items:center;width:100%;padding:6px;background:none;border:0;cursor:pointer;white-space:nowrap}.node--selected[_ngcontent-%COMP%]{background:#fff2cc}.node__icon[_ngcontent-%COMP%]{position:relative;display:inline-block}.node__count[_ngcontent-%COMP%]{color:#fff;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);font-size:.875rem;padding-top:4px}.node__iconImg[_ngcontent-%COMP%]{display:block;height:30px;width:30px}.node__name[_ngcontent-%COMP%]{margin-left:6px;font-size:1rem;overflow:hidden;text-overflow:ellipsis}.node__document-options[_ngcontent-%COMP%]{margin-left:auto;margin-right:0}"] });
+        }, directives: [i2__namespace$1.NgControlStatusGroup, i2__namespace$1.FormGroupDirective, i2__namespace$1.DefaultValueAccessor, i2__namespace$1.NgControlStatus, i2__namespace$1.FormControlName, CaseFileViewFolderSortComponent, i2__namespace.NgIf, i7__namespace.CdkTree, i7__namespace.CdkTreeNodeDef, i7__namespace.CdkNestedTreeNode, CaseFileViewFolderDocumentActionsComponent, i7__namespace.CdkTreeNodeToggle, i7__namespace.CdkTreeNodeOutlet], styles: ["[_nghost-%COMP%]{display:flex;height:100%;flex-direction:column}[_nghost-%COMP%]   .document-tree-container[_ngcontent-%COMP%]{flex:1 0}.document-filter-container[_ngcontent-%COMP%]{border-bottom:2px solid #c9c9c9}.document-filter-container[_ngcontent-%COMP%]   .document-filter[_ngcontent-%COMP%]{padding:10px}.document-filter-container[_ngcontent-%COMP%]   .document-filter[_ngcontent-%COMP%]   .document-search[_ngcontent-%COMP%]{background:url(/assets/images/icon-search-black.svg) no-repeat 100% #fff;background-position-x:calc(100% - 4px);padding-right:30px;width:100%}.document-filter-container[_ngcontent-%COMP%]   .documents-title[_ngcontent-%COMP%]{height:30%;margin-left:8px;font-weight:700}.document-tree-container[_ngcontent-%COMP%]{padding:4px;overflow-x:hidden;overflow-y:scroll}.document-tree-container__node[_ngcontent-%COMP%]{display:block}.document-tree-container__node[_ngcontent-%COMP%]   .document-tree-container__node[_ngcontent-%COMP%]{padding-left:40px}.document-tree-container[_ngcontent-%COMP%]   .document-tree-invisible[_ngcontent-%COMP%]{display:none}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar{width:7px}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar-thumb{border:4px solid transparent;background-clip:padding-box;border-radius:9999px;background-color:#aaa}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar-button{display:none}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar-track-piece{background:#eee}.document-tree-container[_ngcontent-%COMP%]::-webkit-scrollbar-thumb{background:#ccc}.document-folders-header[_ngcontent-%COMP%]{display:flex;align-items:center;justify-content:space-between;border-bottom:2px solid #c9c9c9;padding:10px}.document-folders-header__title[_ngcontent-%COMP%]{font-weight:700}.node[_ngcontent-%COMP%]{display:flex;align-items:center;width:100%;padding:10px;background:none;border:0;cursor:pointer;white-space:nowrap}.node--selected[_ngcontent-%COMP%]{background:#fff2cc}.node__icon[_ngcontent-%COMP%]{position:relative;display:inline-block}.node__count[_ngcontent-%COMP%]{color:#fff;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);font-size:.875rem;padding-top:4px}.node__iconImg[_ngcontent-%COMP%]{display:block;height:30px;width:30px}.node__name[_ngcontent-%COMP%]{margin-left:6px;font-size:1rem;overflow:hidden;text-overflow:ellipsis}.node__document-options[_ngcontent-%COMP%]{margin-left:auto;margin-right:0}.node__document-upload-timestamp[_ngcontent-%COMP%]{font-size:.8rem;float:left;padding-left:10px}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(CaseFileViewFolderComponent, [{
                 type: i0.Component,
@@ -24335,13 +24667,6 @@
                 }] });
     })();
 
-    var SortOrder;
-    (function (SortOrder) {
-        SortOrder[SortOrder["ASCENDING"] = 0] = "ASCENDING";
-        SortOrder[SortOrder["DESCENDING"] = 1] = "DESCENDING";
-        SortOrder[SortOrder["UNSORTED"] = 2] = "UNSORTED";
-    })(SortOrder || (SortOrder = {}));
-
     function ReadComplexFieldCollectionTableComponent_th_10_Template(rf, ctx) {
         if (rf & 1) {
             var _r4_1 = i0__namespace.ɵɵgetCurrentView();
@@ -24615,7 +24940,7 @@
             return _this;
         }
         ReadComplexFieldCollectionTableComponent.isSortAscending = function (column) {
-            return !(column.sortOrder === SortOrder.UNSORTED || column.sortOrder === SortOrder.DESCENDING);
+            return !(column.sortOrder === exports.SortOrder.UNSORTED || column.sortOrder === exports.SortOrder.DESCENDING);
         };
         ReadComplexFieldCollectionTableComponent.prototype.ngOnInit = function () {
             _super.prototype.ngOnInit.call(this);
@@ -24673,19 +24998,19 @@
             });
         };
         ReadComplexFieldCollectionTableComponent.prototype.sortRowsByColumns = function (column) {
-            var shouldSortInAscendingOrder = this.columnsHorizontalLabel[column].sortOrder === SortOrder.UNSORTED
-                || this.columnsHorizontalLabel[column].sortOrder === SortOrder.DESCENDING;
+            var shouldSortInAscendingOrder = this.columnsHorizontalLabel[column].sortOrder === exports.SortOrder.UNSORTED
+                || this.columnsHorizontalLabel[column].sortOrder === exports.SortOrder.DESCENDING;
             // tslint:disable-next-line:switch-default
             switch (this.columnsHorizontalLabel[column].type.type) {
                 case 'Number':
                 case 'MoneyGBP': {
                     if (shouldSortInAscendingOrder) {
                         this.rows.sort(function (a, b) { return a[column] - b[column]; });
-                        this.columnsHorizontalLabel[column].sortOrder = SortOrder.ASCENDING;
+                        this.columnsHorizontalLabel[column].sortOrder = exports.SortOrder.ASCENDING;
                     }
                     else {
                         this.rows.sort(function (a, b) { return b[column] - a[column]; });
-                        this.columnsHorizontalLabel[column].sortOrder = SortOrder.DESCENDING;
+                        this.columnsHorizontalLabel[column].sortOrder = exports.SortOrder.DESCENDING;
                     }
                     break;
                 }
@@ -24702,11 +25027,11 @@
                     {
                         if (shouldSortInAscendingOrder) {
                             this.rows.sort(function (a, b) { return a[column] < b[column] ? -1 : a[column] > b[column] ? 1 : 0; });
-                            this.columnsHorizontalLabel[column].sortOrder = SortOrder.ASCENDING;
+                            this.columnsHorizontalLabel[column].sortOrder = exports.SortOrder.ASCENDING;
                         }
                         else {
                             this.rows.sort(function (a, b) { return a[column] < b[column] ? 1 : a[column] > b[column] ? -1 : 0; });
-                            this.columnsHorizontalLabel[column].sortOrder = SortOrder.DESCENDING;
+                            this.columnsHorizontalLabel[column].sortOrder = exports.SortOrder.DESCENDING;
                         }
                     }
                     break;
@@ -24722,7 +25047,7 @@
                     var id = _c.value;
                     var trimmedId = id.trim();
                     labelsHorizontal[trimmedId] = allLabels[trimmedId];
-                    labelsHorizontal[trimmedId].sortOrder = SortOrder.UNSORTED;
+                    labelsHorizontal[trimmedId].sortOrder = exports.SortOrder.UNSORTED;
                     delete labelsVertical[trimmedId];
                 }
             }
@@ -26641,7 +26966,7 @@
             }
             return searchResults.sort(function (a, b) {
                 return sortParameters.comparator.compare(a, b)
-                    * (sortParameters.sortOrder === SortOrder.DESCENDING ? 1 : -1);
+                    * (sortParameters.sortOrder === exports.SortOrder.DESCENDING ? 1 : -1);
             });
         };
         return SortSearchResultPipe;
@@ -28609,7 +28934,8 @@
             JudicialworkerService,
             CaseworkerService,
             SessionStorageService,
-            EventCompletionStateMachineService
+            EventCompletionStateMachineService,
+            ValidPageListCaseFieldsService
         ], imports: [[
                 i2.CommonModule,
                 i1$1.RouterModule,
@@ -28725,7 +29051,8 @@
                             JudicialworkerService,
                             CaseworkerService,
                             SessionStorageService,
-                            EventCompletionStateMachineService
+                            EventCompletionStateMachineService,
+                            ValidPageListCaseFieldsService
                         ]
                     }]
             }], null, null);
@@ -29820,6 +30147,7 @@
             });
         };
         WorkbasketFiltersComponent.prototype.apply = function (init) {
+            var _this = this;
             // Save filters as query parameters for current route
             var queryParams = {};
             if (this.selected.jurisdiction) {
@@ -29851,9 +30179,20 @@
             if (init) {
                 this.windowService.setLocalStorage(SAVED_QUERY_PARAM_LOC_STORAGE, JSON.stringify(queryParams));
                 if (Object.keys(this.formGroup.controls).length > 0) {
+                    // Find all "special case" JudicialUser FormControl keys and remove the corresponding values from the
+                    // FormGroup value because these values are not intended to be stored and subsequently passed as query string
+                    // parameters when calling searchCases API endpoint
+                    var judicialUserControlValuesToRemove = Object.keys(this.formGroup.controls).filter(function (key) { return key.endsWith('_judicialUserControl'); });
+                    judicialUserControlValuesToRemove.forEach(function (controlKey) { return delete _this.formGroup.value[controlKey]; });
                     this.windowService.setLocalStorage(FORM_GROUP_VAL_LOC_STORAGE, JSON.stringify(this.formGroup.value));
                 }
             }
+            // Announce selected jurisdiction via JurisdictionService
+            if (this.selected.jurisdiction) {
+                // Set the selected case type as the current case type of the selected jurisdiction
+                this.selected.jurisdiction.currentCaseType = this.selected.caseType;
+                this.jurisdictionService.announceSelectedJurisdiction(this.selected.jurisdiction);
+            }
             // Apply filters
             this.onApply.emit({ selected: this.selected, queryParams: queryParams });
             this.setFocusToTop();