@hmcts/ccd-case-ui-toolkit 6.19.11 → 6.19.12-exui-997-rc1

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

@@ -2,7 +2,7 @@
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('rpx-xui-translation'), require('@angular/router'), require('@angular/forms'), require('rx-polling'), require('rxjs'), require('@angular/common/http'), require('rxjs/operators'), require('class-transformer'), require('moment'), require('underscore'), require('pegjs'), require('util'), require('@edium/fsm'), require('@angular/material/dialog'), require('@nicky-lenaers/ngx-scroll-to'), require('ngx-md'), require('@angular/material/autocomplete'), require('@angular/material/core'), require('@hmcts/ccpay-web-component'), require('@angular/cdk/overlay'), require('@angular/cdk/tree'), require('@angular/material/input'), require('@angular-material-components/datetime-picker'), require('@angular-material-components/moment-adapter'), require('@angular/material/datepicker'), require('@angular/material/form-field'), require('@hmcts/media-viewer'), require('@angular/cdk/portal'), require('ngx-pagination'), require('@angular/material/tabs')) :
     typeof define === 'function' && define.amd ? define('@hmcts/ccd-case-ui-toolkit', ['exports', '@angular/core', '@angular/common', 'rpx-xui-translation', '@angular/router', '@angular/forms', 'rx-polling', 'rxjs', '@angular/common/http', 'rxjs/operators', 'class-transformer', 'moment', 'underscore', 'pegjs', 'util', '@edium/fsm', '@angular/material/dialog', '@nicky-lenaers/ngx-scroll-to', 'ngx-md', '@angular/material/autocomplete', '@angular/material/core', '@hmcts/ccpay-web-component', '@angular/cdk/overlay', '@angular/cdk/tree', '@angular/material/input', '@angular-material-components/datetime-picker', '@angular-material-components/moment-adapter', '@angular/material/datepicker', '@angular/material/form-field', '@hmcts/media-viewer', '@angular/cdk/portal', 'ngx-pagination', '@angular/material/tabs'], factory) :
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.hmcts = global.hmcts || {}, global.hmcts["ccd-case-ui-toolkit"] = {}), global.ng.core, global.ng.common, global.i1, global.ng.router, global.ng.forms, global["rx-polling"], global.rxjs, global.ng.common.http, global.rxjs.operators, global["class-transformer"], global.moment, global.underscore, global.pegjs, global.util, global["@edium/fsm"], global.ng.material.dialog, global["@nicky-lenaers/ngx-scroll-to"], global["ngx-md"], global.ng.material.autocomplete, global.ng.material.core, global["@hmcts/ccpay-web-component"], global.ng.cdk.overlay, global.ng.cdk.tree, global.ng.material.input, global["@angular-material-components/datetime-picker"], global["@angular-material-components/moment-adapter"], global.ng.material.datepicker, global.ng.material.formField, global.i12, global.ng.cdk.portal, global["ngx-pagination"], global.ng.material.tabs));
-})(this, (function (exports, i0, i2, i1, i1$1, i2$1, polling, rxjs, i1$2, operators, classTransformer, moment, _, pegjs, util, fsm, i1$3, i2$2, i1$4, i5, i6, i3, i1$5, i7, i3$1, i4, momentAdapter, i5$1, i6$1, i12, i6$2, i1$6, i10) { 'use strict';
+})(this, (function (exports, i0, i2, i1, i1$1, i2$1, polling, rxjs, i1$2, operators, classTransformer, moment, _, pegjs, util, fsm, i1$3, i2$2, i1$4, i5, i6, i3, i1$5, i8, i3$1, i4, momentAdapter, i5$1, i6$1, i12, i6$2, i1$6, i10) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -40,7 +40,7 @@
     var i6__namespace = /*#__PURE__*/_interopNamespace(i6);
     var i3__namespace = /*#__PURE__*/_interopNamespace(i3);
     var i1__namespace$5 = /*#__PURE__*/_interopNamespace(i1$5);
-    var i7__namespace = /*#__PURE__*/_interopNamespace(i7);
+    var i8__namespace = /*#__PURE__*/_interopNamespace(i8);
     var i3__namespace$1 = /*#__PURE__*/_interopNamespace(i3$1);
     var i4__namespace = /*#__PURE__*/_interopNamespace(i4);
     var i5__namespace$1 = /*#__PURE__*/_interopNamespace(i5$1);
@@ -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() {
@@ -14696,15 +14696,6 @@
             _this.valid = true;
             return _this;
         }
-        WriteDocumentFieldComponent.prototype.clickout = function (event) {
-            // Capturing the event of the associated  ElementRef <input type="file" #fileInpu
-            if (this.fileInput.nativeElement.contains(event.target)) {
-                this.clickInsideTheDocument = true;
-            }
-            else {
-                this.fileValidations();
-            }
-        };
         WriteDocumentFieldComponent.prototype.ngOnInit = function () {
             this.secureModeOn = this.appConfig.getDocumentSecureMode();
             if (this.secureModeOn) {
@@ -14966,10 +14957,6 @@
                 var _t = void 0;
                 i0__namespace.ɵɵqueryRefresh(_t = i0__namespace.ɵɵloadQuery()) && (ctx.fileInput = _t.first);
             }
-        }, hostBindings: function WriteDocumentFieldComponent_HostBindings(rf, ctx) {
-            if (rf & 1) {
-                i0__namespace.ɵɵlistener("click", function WriteDocumentFieldComponent_click_HostBindingHandler($event) { return ctx.clickout($event); }, false, i0__namespace.ɵɵresolveDocument);
-            }
         }, features: [i0__namespace.ɵɵInheritDefinitionFeature], decls: 19, vars: 22, consts: [[1, "form-group", 3, "ngClass"], [3, "for"], [1, "form-label"], ["class", "form-hint", 4, "ngIf"], ["class", "error-message", 4, "ngIf"], [3, "caseField", 4, "ngIf"], [2, "position", "relative"], [3, "id", "click"], ["type", "file", 1, "form-control", "bottom-30", 3, "id", "accept", "keydown.Tab", "change"], ["fileInput", ""], [1, "form-group", "bottom-30"], ["type", "button", "aria-label", "Cancel upload", 1, "button", "button-secondary", 3, "disabled", "click"], [1, "form-hint"], [1, "error-message"], [3, "caseField"]], template: function WriteDocumentFieldComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
@@ -15038,9 +15025,6 @@
             }], function () { return [{ type: AbstractAppConfig }, { type: CaseNotifier }, { type: DocumentManagementService }, { type: i1__namespace$3.MatDialog }, { type: FileUploadStateService }, { type: JurisdictionService }]; }, { fileInput: [{
                     type: i0.ViewChild,
                     args: ['fileInput', { static: false }]
-                }], clickout: [{
-                    type: i0.HostListener,
-                    args: ['document:click', ['$event']]
                 }] });
     })();
 
@@ -21975,20 +21959,38 @@
                 }] });
     })();
 
+    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() {
+        function CaseFileViewFolderSortComponent(appConfig) {
             var _this = this;
+            this.appConfig = appConfig;
             this.isOpen = false;
             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); } },
             ];
         }
+        CaseFileViewFolderSortComponent.prototype.ngOnInit = function () {
+            var _this = this;
+            if (this.appConfig.getEnableCaseFileViewVersion1_1()) {
+                this.overlayMenuItems = [
+                    { 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;
     }());
-    CaseFileViewFolderSortComponent.ɵfac = function CaseFileViewFolderSortComponent_Factory(t) { return new (t || CaseFileViewFolderSortComponent)(); };
+    CaseFileViewFolderSortComponent.ɵfac = function CaseFileViewFolderSortComponent_Factory(t) { return new (t || CaseFileViewFolderSortComponent)(i0__namespace.ɵɵdirectiveInject(AbstractAppConfig)); };
     CaseFileViewFolderSortComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: CaseFileViewFolderSortComponent, selectors: [["ccd-case-file-view-folder-sort"]], outputs: { sortAscending: "sortAscending", sortDescending: "sortDescending" }, decls: 3, vars: 3, consts: [[3, "title", "menuItems", "isOpen", "isOpenChange"], ["trigger", ""], ["src", "/assets/img/sort/sort-arrows.svg", "alt", "Sort Arrows", 1, "sort-button-icon"]], template: function CaseFileViewFolderSortComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "ccd-case-file-view-overlay-menu", 0);
@@ -22010,7 +22012,7 @@
                         templateUrl: './case-file-view-folder-sort.component.html',
                         styleUrls: ['./case-file-view-folder-sort.component.scss']
                     }]
-            }], function () { return []; }, { sortAscending: [{
+            }], function () { return [{ type: AbstractAppConfig }]; }, { sortAscending: [{
                     type: i0.Output
                 }], sortDescending: [{
                     type: i0.Output
@@ -22067,48 +22069,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", {
@@ -22134,6 +22144,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([
@@ -22164,10 +22192,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();
@@ -22179,27 +22211,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();
         }
@@ -22224,7 +22258,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();
@@ -22242,17 +22276,18 @@
     }
     var MEDIA_VIEWER_LOCALSTORAGE_KEY = 'media-viewer-info';
     var CaseFileViewFolderComponent = /** @class */ (function () {
-        function CaseFileViewFolderComponent(windowService, router, documentManagementService, dialog) {
+        function CaseFileViewFolderComponent(windowService, router, documentManagementService, dialog, appConfig) {
             this.windowService = windowService;
             this.router = router;
             this.documentManagementService = documentManagementService;
             this.dialog = dialog;
+            this.appConfig = appConfig;
             this.clickedDocument = new i0.EventEmitter();
             this.moveDocument = new i0.EventEmitter();
             this.categories = [];
             this.getChildren = function (node) { return rxjs.of(node.children); };
             this.nestedChildren = function (_, nodeData) { return nodeData.children; };
-            this.nestedTreeControl = new i7.NestedTreeControl(this.getChildren);
+            this.nestedTreeControl = new i8.NestedTreeControl(this.getChildren);
         }
         Object.defineProperty(CaseFileViewFolderComponent.prototype, "documentCount", {
             get: function () {
@@ -22311,6 +22346,7 @@
             }, []);
         };
         CaseFileViewFolderComponent.prototype.getDocuments = function (documents) {
+            var _this = this;
             var documentsToReturn = [];
             documents.forEach(function (document) {
                 var documentTreeNode = new DocumentTreeNode();
@@ -22319,11 +22355,14 @@
                 documentTreeNode.document_filename = document.document_filename;
                 documentTreeNode.document_binary_url = document.document_binary_url;
                 documentTreeNode.attribute_path = document.attribute_path;
+                documentTreeNode.upload_timestamp = _this.appConfig.getEnableCaseFileViewVersion1_1()
+                    && document.upload_timestamp ? moment__namespace(document.upload_timestamp).format('DD MMM YYYY') : '';
                 documentsToReturn.push(documentTreeNode);
             });
             return documentsToReturn;
         };
         CaseFileViewFolderComponent.prototype.getUncategorisedDocuments = function (uncategorisedDocuments) {
+            var _this = this;
             var documents = [];
             uncategorisedDocuments.forEach(function (document) {
                 var documentTreeNode = new DocumentTreeNode();
@@ -22332,6 +22371,8 @@
                 documentTreeNode.document_filename = document.document_filename;
                 documentTreeNode.document_binary_url = document.document_binary_url;
                 documentTreeNode.attribute_path = document.attribute_path;
+                documentTreeNode.upload_timestamp = _this.appConfig.getEnableCaseFileViewVersion1_1()
+                    && document.upload_timestamp ? moment__namespace(document.upload_timestamp).format('DD MMM YYYY') : '';
                 documents.push(documentTreeNode);
             });
             var uncategorisedNode = new DocumentTreeNode();
@@ -22386,16 +22427,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);
@@ -22455,8 +22496,8 @@
     CaseFileViewFolderComponent.UNCATEGORISED_DOCUMENTS_TITLE = 'Uncategorised documents';
     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.ɵ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), i0__namespace.ɵɵdirectiveInject(AbstractAppConfig)); };
+    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);
@@ -22469,7 +22510,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();
@@ -22483,7 +22524,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, i8__namespace.CdkTree, i8__namespace.CdkTreeNodeDef, i8__namespace.CdkNestedTreeNode, CaseFileViewFolderDocumentActionsComponent, i8__namespace.CdkTreeNodeToggle, i8__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,
@@ -22492,7 +22533,7 @@
                         templateUrl: './case-file-view-folder.component.html',
                         styleUrls: ['./case-file-view-folder.component.scss'],
                     }]
-            }], function () { return [{ type: WindowService }, { type: i1__namespace$1.Router }, { type: DocumentManagementService }, { type: i1__namespace$3.MatDialog }]; }, { categoriesAndDocuments: [{
+            }], function () { return [{ type: WindowService }, { type: i1__namespace$1.Router }, { type: DocumentManagementService }, { type: i1__namespace$3.MatDialog }, { type: AbstractAppConfig }]; }, { categoriesAndDocuments: [{
                     type: i0.Input
                 }], allowMoving: [{
                     type: i0.Input
@@ -24399,13 +24440,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();
@@ -24679,7 +24713,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);
@@ -24737,19 +24771,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;
                 }
@@ -24766,11 +24800,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;
@@ -24786,7 +24820,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];
                 }
             }
@@ -26511,7 +26545,7 @@
         /**
          * Filter out fields having no data to display and harmonise field values coming parent's value.
          */
-        ReadFieldsFilterPipe.prototype.transform = function (complexField, keepEmpty, index, setupHidden, formGroup, path, idPrefix) {
+        ReadFieldsFilterPipe.prototype.transform = function (complexField, keepEmpty, index, setupHidden, formGroup, path, idPrefix, metadataFieldsObject) {
             if (setupHidden === void 0) { setupHidden = false; }
             if (!complexField || !complexField.field_type) {
                 return [];
@@ -26521,12 +26555,19 @@
             var checkConditionalShowAgainst = values;
             var formGroupAvailable = false;
             if (formGroup) {
-                checkConditionalShowAgainst = formGroup.parent.getRawValue().data;
+                checkConditionalShowAgainst = metadataFieldsObject ?
+                    Object.assign(formGroup.parent.getRawValue().data, metadataFieldsObject) : formGroup.parent.getRawValue().data;
                 formGroupAvailable = true;
-                if (idPrefix) {
-                    var fieldId = idPrefix.substring(0, idPrefix.indexOf('_'));
-                    if (checkConditionalShowAgainst[fieldId]) {
-                        checkConditionalShowAgainst = values;
+                if (idPrefix !== undefined) {
+                    if (idPrefix !== '') {
+                        var fieldId = idPrefix.substring(0, idPrefix.indexOf('_'));
+                        if (checkConditionalShowAgainst[fieldId]) {
+                            checkConditionalShowAgainst = values;
+                            formGroupAvailable = false;
+                        }
+                    }
+                    else {
+                        checkConditionalShowAgainst = Object.assign(checkConditionalShowAgainst, values);
                         formGroupAvailable = false;
                     }
                 }
@@ -26712,7 +26753,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;
@@ -27008,12 +27049,12 @@
                 i3$1.MatInputModule,
                 i5$1.MatDatepickerModule,
                 i5.MatAutocompleteModule,
-                i7.CdkTreeModule,
+                i8.CdkTreeModule,
                 i1$5.OverlayModule,
                 i3.PaymentLibModule,
                 i2$2.ScrollToModule.forRoot(),
                 i1.RpxTranslationModule.forChild(),
-                i7.CdkTreeModule,
+                i8.CdkTreeModule,
                 i1$5.OverlayModule,
                 i1$3.MatDialogModule,
                 i12.MediaViewerModule,
@@ -27156,9 +27197,9 @@
                 i3$1.MatInputModule,
                 i5$1.MatDatepickerModule,
                 i5.MatAutocompleteModule,
-                i7.CdkTreeModule,
+                i8.CdkTreeModule,
                 i1$5.OverlayModule,
-                i3.PaymentLibModule, i2__namespace$2.ScrollToModule, i1__namespace.RpxTranslationModule, i7.CdkTreeModule,
+                i3.PaymentLibModule, i2__namespace$2.ScrollToModule, i1__namespace.RpxTranslationModule, i8.CdkTreeModule,
                 i1$5.OverlayModule,
                 i1$3.MatDialogModule,
                 i12.MediaViewerModule,
@@ -27301,12 +27342,12 @@
                             i3$1.MatInputModule,
                             i5$1.MatDatepickerModule,
                             i5.MatAutocompleteModule,
-                            i7.CdkTreeModule,
+                            i8.CdkTreeModule,
                             i1$5.OverlayModule,
                             i3.PaymentLibModule,
                             i2$2.ScrollToModule.forRoot(),
                             i1.RpxTranslationModule.forChild(),
-                            i7.CdkTreeModule,
+                            i8.CdkTreeModule,
                             i1$5.OverlayModule,
                             i1$3.MatDialogModule,
                             i12.MediaViewerModule,
@@ -27519,7 +27560,7 @@
             i0__namespace.ɵɵproperty("ngIf", ctx_r15.canShowFieldInCYA(field_r16));
         }
     }
-    var _c0$f = function (a0, a4) { return [a0, false, undefined, true, a4]; };
+    var _c0$f = function (a0, a4, a7) { return [a0, false, undefined, true, a4, undefined, undefined, a7]; };
     function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
@@ -27533,13 +27574,13 @@
             var page_r13 = i0__namespace.ɵɵnextContext().$implicit;
             var ctx_r14 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction2(12, _c0$f, i0__namespace.ɵɵpipeBind2(4, 9, page_r13, ctx_r14.editForm), ctx_r14.editForm.controls["data"]))));
+            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBindV(3, 3, i0__namespace.ɵɵpureFunction3(15, _c0$f, i0__namespace.ɵɵpipeBind2(4, 12, page_r13, ctx_r14.editForm), ctx_r14.editForm.controls["data"], ctx_r14.metadataFieldsObject))));
         }
     }
     function CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_Template, 5, 15, "ng-container", 0);
+            i0__namespace.ɵɵtemplate(1, CaseEditSubmitComponent_div_0_ng_container_11_ng_container_7_ng_container_1_Template, 5, 19, "ng-container", 0);
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
@@ -27786,6 +27827,7 @@
         });
         CaseEditSubmitComponent.prototype.ngOnInit = function () {
             var _this = this;
+            var _a, _b, _c;
             this.profileSubscription = this.profileNotifier.profile.subscribe(function (_) { return _this.profile = _; });
             this.eventTrigger = this.caseEdit.eventTrigger;
             this.triggerText = this.eventTrigger.end_button_label || CallbackErrorsComponent.TRIGGER_TEXT_SUBMIT;
@@ -27794,6 +27836,10 @@
             this.showSummaryFields = this.sortFieldsByShowSummaryContent(this.eventTrigger.case_fields);
             this.caseEdit.isSubmitting = false;
             this.contextFields = this.getCaseFields();
+            this.metadataFieldsObject = (_c = (_b = (_a = this.caseEdit) === null || _a === void 0 ? void 0 : _a.caseDetails) === null || _b === void 0 ? void 0 : _b.metadataFields) === null || _c === void 0 ? void 0 : _c.reduce(function (o, key) {
+                var _d;
+                return Object.assign(o, (_d = {}, _d[key.id] = key.value, _d));
+            }, {});
             // Indicates if the submission is for a Case Flag, as opposed to a "regular" form submission, by the presence of
             // a FlagLauncher field in the event trigger
             this.caseEdit.isCaseFlagSubmission =
@@ -32395,12 +32441,13 @@
         };
         // Refactored under EXUI-110 to address infinite tab loop to use tabIndexChanged instead
         CaseFullAccessViewComponent.prototype.tabChanged = function (tabIndexChanged) {
+            var _a;
             var matTab = this.tabGroup._tabs.find(function (tab) { return tab.isActive; });
             var tabLabel = matTab.textLabel;
             // sortedTabs are fragments
             // appended/prepepended tabs use router navigation
             if ((tabIndexChanged <= 1 && this.prependedTabs && this.prependedTabs.length) ||
-                (this.appendedTabs && this.appendedTabs.length && tabLabel === this.HEARINGS_TAB_LABEL)) {
+                (((_a = this.appendedTabs) === null || _a === void 0 ? void 0 : _a.length) && tabLabel === this.HEARINGS_TAB_LABEL)) {
                 // Hack to get ID from tab as it's not easily achieved through Angular Material Tabs
                 var tab = matTab['_viewContainerRef'];
                 var id = tab.element.nativeElement.id;
@@ -32420,6 +32467,7 @@
             var targetTabIndex = this.tabGroup._tabs.toArray().findIndex(function (tab) { return tab.textLabel === triggerOutputEventText; });
             if (targetTabIndex > -1) {
                 this.selectedTabIndex = targetTabIndex;
+                this.tabGroup.selectedIndex = targetTabIndex;
             }
         };
         CaseFullAccessViewComponent.prototype.hasActiveCaseFlags = function () {
@@ -32498,8 +32546,8 @@
             var value = {};
             if (caseFields) {
                 caseFields.forEach(function (caseField) {
-                    var _a;
-                    value = Object.assign(Object.assign({}, value), (_a = {}, _a[caseField.id] = caseField.value, _a));
+                    var _b;
+                    value = Object.assign(Object.assign({}, value), (_b = {}, _b[caseField.id] = caseField.value, _b));
                 });
             }
             return new i2$1.FormGroup({ data: new i2$1.FormControl(value) });