@one-paragon/angular-utilities 2.1.6 → 2.1.7

package/fesm2022/one-paragon-angular-utilities.mjs

@@ -3954,7 +3954,8 @@ const tbGroupBy = (data, groupByKeys, level = 1, parentGroupName) => {
     return groupedDataArr;
 };
 function groupData(groupByKey, groupData, level = 1, parentGroupName) {
-    const groupedDataDict = supportsGroupBy ? Object.groupBy(groupData, d => d[groupByKey]) : groupBy(groupData, groupByKey);
+    const getter = getFactory(groupByKey);
+    const groupedDataDict = supportsGroupBy ? Object.groupBy(groupData, d => getter(d) ?? 'BLANK') : groupBy(groupData, groupByKey);
     const groupedDataArr = Object.entries(groupedDataDict).map(([name, groupData]) => {
         const uniqueName = parentGroupName ? `${parentGroupName}-${name}` : `${name}`;
         return {
@@ -4270,7 +4271,7 @@ class GenericTableComponent {
         if (val == undefined || val === 'null')
             return '';
         try {
-            return createTransformer(this.state.$getMetaData(key)(), this.config, true, true)({ [`${key}`]: val });
+            return createTransformer(this.state.$getMetaData(key)(), this.config, true, true)({ [`${key}`]: val }) || val;
         }
         catch (error) {
             return signal(val);
@@ -4786,20 +4787,20 @@ const _sortAndFilterData = (data, sortState, filterState) => combineLatest([
 ]).pipe(scan((mappedData, [data, sort, f], index) => {
     return mapDataSortsAndFilters(data, f, sort, index === 0, mappedData);
 }, [])).pipe(map$1((resultData) => resultData.filter(item => !item[tbNoShowSymbol])), defaultShareReplay());
-const mapDataSortsAndFilters = (allData, filters, sort, firstRun, filteredData) => {
+const mapDataSortsAndFilters = (allData, filters, sort, firstRun, filteredAndSortedData) => {
     const fresh = firstRun || (allData.timestamp > sort.timestamp && allData.timestamp > filters.timestamp);
     const sortChanged = !fresh && sort.timestamp > filters.timestamp;
     const filterRemoved = !fresh && !sortChanged && !filters.value.onlyAddedFilters;
     const runAllOnAllData = fresh || filterRemoved;
     const resetFilters = !fresh && filterRemoved;
     if (runAllOnAllData) {
-        const filteredData = filterData(sortData(allData.value, sort.value.sortsToRun), filters.value.allFilters, resetFilters);
+        const filteredData = filterData(sortData(allData.value, sort.value.allSorts), filters.value.allFilters, resetFilters);
         return filteredData;
     }
     if (sortChanged) {
-        return (sortData(filteredData, sort.value.sortsToRun));
+        return (sortData(filteredAndSortedData, sort.value.sortsToRun));
     }
-    return (filterData(filteredData, filters.value.onlyAddedFilters || filters.value.allFilters, resetFilters));
+    return (filterData(filteredAndSortedData, filters.value.onlyAddedFilters || filters.value.allFilters, resetFilters));
 };
 const sortAndFilterData = (data, filters, sort, firstRun, resultData) => {
     const markedAndSortedData = mapDataSortsAndFilters(data, filters, sort, firstRun, resultData);
@@ -5053,14 +5054,21 @@ function mergeCustomCellMetaData(metaData1, metaData2) {
 
 class GroupByListComponent {
     tableStore = inject(TableStore);
+    $groups = computed(() => {
+        const dict = this.tableStore.$metaData();
+        return this.tableStore.$groupByKeys().map(gbk => ({
+            key: gbk,
+            name: dict[gbk].displayName || gbk
+        }));
+    });
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: GroupByListComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.1", type: GroupByListComponent, isStandalone: true, selector: "group-by-list", ngImport: i0, template: "<span class=\"tb-group-label\">Group By:</span>\r\n<mat-chip-set>\r\n  @for (groupByKey of tableStore.$groupByKeys(); track groupByKey)\r\n  {\r\n    @if($index > 0)\r\n    {\r\n      <mat-icon class=\"nested-arrow\">arrow_right</mat-icon>\r\n    }\r\n    <mat-chip (removed)=\"tableStore.removeGroupByKey(groupByKey)\">\r\n      {{groupByKey | spaceCase}}\r\n      <mat-icon matChipRemove>cancel</mat-icon>\r\n    </mat-chip>\r\n  }\r\n</mat-chip-set>\r\n", styles: [".tb-group-label{font-weight:bolder;padding-right:15px}:host{display:flex;padding-left:8px;align-items:center}:host mat-chip-set mat-chip{margin:0}:host mat-chip-set .nested-arrow{display:flex;width:15px;justify-content:center}\n"], dependencies: [{ kind: "ngmodule", type: MatChipsModule }, { kind: "component", type: i4$2.MatChip, selector: "mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]", inputs: ["role", "id", "aria-label", "aria-description", "value", "color", "removable", "highlighted", "disableRipple", "disabled"], outputs: ["removed", "destroyed"], exportAs: ["matChip"] }, { kind: "directive", type: i4$2.MatChipRemove, selector: "[matChipRemove]" }, { kind: "component", type: i4$2.MatChipSet, selector: "mat-chip-set", inputs: ["disabled", "role", "tabIndex"] }, { kind: "ngmodule", type: MatIconModule }, { kind: "component", type: i2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "pipe", type: SpaceCasePipe, name: "spaceCase" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.1", type: GroupByListComponent, isStandalone: true, selector: "group-by-list", ngImport: i0, template: "<span class=\"tb-group-label\">Group By:</span>\r\n<mat-chip-set>\r\n  @for (groupBy of $groups(); track groupBy.key)\r\n  {\r\n    @if($index > 0)\r\n    {\r\n      <mat-icon class=\"nested-arrow\">arrow_right</mat-icon>\r\n    }\r\n    <mat-chip (removed)=\"tableStore.removeGroupByKey(groupBy.key)\">\r\n      {{groupBy.name | spaceCase}}\r\n      <mat-icon matChipRemove>cancel</mat-icon>\r\n    </mat-chip>\r\n  }\r\n</mat-chip-set>\r\n", styles: [".tb-group-label{font-weight:bolder;padding-right:15px}:host{display:flex;padding-left:8px;align-items:center}:host mat-chip-set mat-chip{margin:0}:host mat-chip-set .nested-arrow{display:flex;width:15px;justify-content:center}\n"], dependencies: [{ kind: "ngmodule", type: MatChipsModule }, { kind: "component", type: i4$2.MatChip, selector: "mat-basic-chip, [mat-basic-chip], mat-chip, [mat-chip]", inputs: ["role", "id", "aria-label", "aria-description", "value", "color", "removable", "highlighted", "disableRipple", "disabled"], outputs: ["removed", "destroyed"], exportAs: ["matChip"] }, { kind: "directive", type: i4$2.MatChipRemove, selector: "[matChipRemove]" }, { kind: "component", type: i4$2.MatChipSet, selector: "mat-chip-set", inputs: ["disabled", "role", "tabIndex"] }, { kind: "ngmodule", type: MatIconModule }, { kind: "component", type: i2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "pipe", type: SpaceCasePipe, name: "spaceCase" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: GroupByListComponent, decorators: [{
             type: Component,
             args: [{ selector: 'group-by-list', changeDetection: ChangeDetectionStrategy.OnPush, imports: [
                         MatChipsModule, MatIconModule, SpaceCasePipe
-                    ], template: "<span class=\"tb-group-label\">Group By:</span>\r\n<mat-chip-set>\r\n  @for (groupByKey of tableStore.$groupByKeys(); track groupByKey)\r\n  {\r\n    @if($index > 0)\r\n    {\r\n      <mat-icon class=\"nested-arrow\">arrow_right</mat-icon>\r\n    }\r\n    <mat-chip (removed)=\"tableStore.removeGroupByKey(groupByKey)\">\r\n      {{groupByKey | spaceCase}}\r\n      <mat-icon matChipRemove>cancel</mat-icon>\r\n    </mat-chip>\r\n  }\r\n</mat-chip-set>\r\n", styles: [".tb-group-label{font-weight:bolder;padding-right:15px}:host{display:flex;padding-left:8px;align-items:center}:host mat-chip-set mat-chip{margin:0}:host mat-chip-set .nested-arrow{display:flex;width:15px;justify-content:center}\n"] }]
+                    ], template: "<span class=\"tb-group-label\">Group By:</span>\r\n<mat-chip-set>\r\n  @for (groupBy of $groups(); track groupBy.key)\r\n  {\r\n    @if($index > 0)\r\n    {\r\n      <mat-icon class=\"nested-arrow\">arrow_right</mat-icon>\r\n    }\r\n    <mat-chip (removed)=\"tableStore.removeGroupByKey(groupBy.key)\">\r\n      {{groupBy.name | spaceCase}}\r\n      <mat-icon matChipRemove>cancel</mat-icon>\r\n    </mat-chip>\r\n  }\r\n</mat-chip-set>\r\n", styles: [".tb-group-label{font-weight:bolder;padding-right:15px}:host{display:flex;padding-left:8px;align-items:center}:host mat-chip-set mat-chip{margin:0}:host mat-chip-set .nested-arrow{display:flex;width:15px;justify-content:center}\n"] }]
         }] });
 
 class ProfilesMenuComponent {