@one-paragon/angular-utilities 2.1.3 → 2.1.4

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

@@ -4,9 +4,9 @@ import { shareReplay, switchAll, map, filter, tap, catchError, startWith, switch
 import * as i1 from 'rxjs';
 import { Subject, isObservable, of, ReplaySubject, filter as filter$1, first, map as map$1, Observable, combineLatest, Subscription, startWith as startWith$1, pairwise, pipe, concatMap, merge, delay, fromEvent, takeUntil as takeUntil$1, tap as tap$1, switchMap as switchMap$1, scan, timestamp } from 'rxjs';
 import { toObservable, toSignal, outputFromObservable } from '@angular/core/rxjs-interop';
-import { isFunction, merge as merge$1, get, sumBy, difference, groupBy, intersection, set } from 'lodash';
 import * as i3$2 from '@angular/material/sort';
 import { MatSort, MatSortModule } from '@angular/material/sort';
+import { merge as merge$1, sumBy, difference, groupBy, intersection, set, get } from 'lodash';
 import { CdkColumnDef } from '@angular/cdk/table';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
@@ -725,7 +725,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImpor
             type: Injectable
         }], ctorParameters: () => [] });
 function createRequestor(req, optionsOrProject, options) {
-    const ops = isFunction(optionsOrProject) ? options : optionsOrProject;
+    const ops = typeof (optionsOrProject) === 'function' ? options : optionsOrProject;
     const injector = getInjector(ops);
     return runInInjectionContext(injector, () => {
         const requestStore = typeof (optionsOrProject) === 'function' ?
@@ -1794,6 +1794,89 @@ const BooleanFilterFuncs = {
     [FilterType.IsNull]: isNull,
 };
 
+function sortData(data, sorted) {
+    return data.sort(compareT(sorted));
+}
+function filterData(data, filters, resetAll = false) {
+    if (filters.length === 0) {
+        if (resetAll) {
+            for (let index = 0; index < data.length; index++) {
+                const element = data[index];
+                element[tbNoShowSymbol] = false;
+            }
+        }
+        return data;
+    }
+    for (let index = 0; index < data.length; index++) {
+        const element = data[index];
+        const hide = !filters.every(filter => filter(element));
+        if (hide || resetAll) {
+            element[tbNoShowSymbol] = hide;
+        }
+    }
+    return data;
+}
+const tbNoShowSymbol = Symbol('tb_no_show');
+function compareT(criteria) {
+    const transforms = criteria.reduce((acc, c) => {
+        acc[c.active] = {
+            transform: c.sortBy ? c.sortBy : getFactory(c.active), nulls: c.nulls === 'first' ? -1 : 1
+        };
+        return acc;
+    }, {});
+    return function (a, b) {
+        for (let index = 0; index < criteria.length; index++) {
+            const c = criteria[index];
+            const d = transforms[c.active];
+            const nullValue = d.nulls;
+            if (a == null) {
+                if (b == null)
+                    return 0;
+                return nullValue;
+            }
+            if (b == null)
+                return -nullValue;
+            const transform = d.transform;
+            const aVal = transform(a);
+            const bVal = transform(b);
+            if (aVal == null) {
+                if (bVal == null)
+                    return 0;
+                return nullValue;
+            }
+            if (bVal == null)
+                return -nullValue;
+            if (aVal < bVal)
+                return c.direction === 'asc' ? -1 : 1;
+            if (aVal > bVal)
+                return c.direction === 'asc' ? 1 : -1;
+        }
+        return 0;
+    };
+}
+function getFactory(b) {
+    if (typeof b !== 'string')
+        return (a) => a[b];
+    if (!b.includes('.'))
+        return (a) => {
+            if (!a)
+                return a;
+            return a[b];
+        };
+    const arr = b.split('.');
+    return (a) => {
+        let val = a;
+        if (!a)
+            return a;
+        for (let index = 0; index < arr.length; index++) {
+            val = val[arr[index]];
+            if (typeof val !== 'object' && index + 1 < arr.length)
+                return undefined;
+        }
+        return val;
+    };
+}
+
 const filterFactoryMap = {
     [FilterType.And]: (filter) => {
         const filters = createFilterFuncs(filter.filterValue);
@@ -1848,7 +1931,7 @@ function createFilterFunc(filter) {
         }
     }
     const cannotBeTrueForNull = !FalseyValueCanBeIncludedFilterTypes.includes(filter.filterType);
-    const getter = filter.filterBy || ((rowObj) => get(rowObj, filter.key));
+    const getter = filter.filterBy || getFactory(filter.key);
     return (rowObj) => {
         const value = getter(rowObj);
         return ((value == undefined) && cannotBeTrueForNull)
@@ -3280,8 +3363,7 @@ function isPipe(o) {
     return typeof (o.transform) === 'function';
 }
 function createTransformer(metaData, config, noIcons = false, forItem = false) {
-    const nested = metaData.key.includes('.');
-    const defaultFunc = nested ? (value) => get(value, metaData.key) : (value) => value[metaData.key];
+    const defaultFunc = getFactory(metaData.key);
     if (metaData.map && !forItem) {
         return (value) => {
             return metaData.map(value);
@@ -4317,7 +4399,7 @@ class ExportToCsvService {
         return res.join('\n');
     };
     metaToField = (meta, row) => {
-        let val = get(row, meta.key);
+        let val = getFactory(meta.key)(row);
         if (val == null && !meta.transform)
             return val;
         if (meta.transform && meta.fieldType !== FieldType.Expression) {
@@ -4380,9 +4462,15 @@ function createLinkCreator(metaData) {
     const target = metaData.additional?.link?.target || '_blank';
     const useRouterLink = metaData.additional?.link?.useRouterLink || false;
     const hasRoute = !!metaData.additional?.link?.interpolatedRoute;
+    const qp = useRouterLink ?
+        metaData.additional.link.routerLinkOptions?.queryParams?.reduce((map, [key, value]) => {
+            map[key] = typeof value === 'function' ? value : parseInterpolated(value);
+            return map;
+        }, {})
+        : undefined;
     const routerLinkOptions = useRouterLink ? {
         queryParams: (element) => metaData.additional.link.routerLinkOptions?.queryParams?.reduce((map, [key, value]) => {
-            map[key] = typeof value === 'function' ? value(element) : parseInterpolated(value, element);
+            map[key] = qp[key](element);
             return map;
         }, {}) ?? null,
         fragment: metaData.additional.link?.routerLinkOptions?.fragment,
@@ -4393,7 +4481,7 @@ function createLinkCreator(metaData) {
     if (hasRoute) {
         const value = metaData.additional.link.interpolatedRoute;
         return ({
-            link: (element) => typeof value === 'function' ? value(element) : parseInterpolated(value, element),
+            link: typeof value === 'function' ? (element) => value(element) : parseInterpolated(value),
             target,
             useRouterLink,
             routerLinkOptions,
@@ -4412,10 +4500,33 @@ function createLinkCreator(metaData) {
     }
 }
 const key = (metaData) => metaData.additional.link?.urlKey ?
-    (element) => get(element, metaData.additional.link.urlKey)
+    getFactory(metaData.additional.link.urlKey)
     :
-        (element) => get(element, metaData.key);
-const parseInterpolated = (interpolatedString, element) => interpolatedString.replace(/{([^}]+)}/g, (_, key) => get(element, key));
+        getFactory(metaData.key);
+function parseInterpolated(input) {
+    // Match either content inside curly braces or content between curly braces
+    const parts = input.split(/({[\w.]+})/);
+    const result = parts
+        .filter(part => part !== '') // Remove empty strings
+        .map(part => {
+        if (part.startsWith('{') && part.endsWith('}')) {
+            // For interpolated values, remove the curly braces
+            return {
+                type: 'interpolated',
+                val: getFactory(part.slice(1, -1))
+            };
+        }
+        else {
+            return {
+                type: 'string',
+                val: part
+            };
+        }
+    });
+    return function (val) {
+        return result.map(part => part.type === 'string' ? part.val : part.val(val)).join('');
+    };
+}
 
 class TableBuilderStateStore extends ComponentStore {
     constructor() {
@@ -4666,59 +4777,6 @@ function patchDirectiveFromState(directive, stateFilter) {
     }
 }
 
-function sortData(data, sorted) {
-    return data.sort(compareT(sorted));
-}
-function filterData(data, filters, resetAll = false) {
-    if (filters.length === 0) {
-        if (resetAll) {
-            for (let index = 0; index < data.length; index++) {
-                const element = data[index];
-                element[tbNoShowSymbol] = false;
-            }
-        }
-        return data;
-    }
-    for (let index = 0; index < data.length; index++) {
-        const element = data[index];
-        const hide = !filters.every(filter => filter(element));
-        if (hide || resetAll) {
-            element[tbNoShowSymbol] = hide;
-        }
-    }
-    return data;
-}
-const tbNoShowSymbol = Symbol('tb_no_show');
-function compareT(criteria) {
-    return function (a, b) {
-        for (let index = 0; index < criteria.length; index++) {
-            const c = criteria[index];
-            const nullValue = c.nulls === 'first' ? -1 : 1;
-            if (a == null) {
-                if (b == null)
-                    return 0;
-                return nullValue;
-            }
-            if (b == null)
-                return -nullValue;
-            const aVal = c.sortBy ? c.sortBy(a) : a[c.active];
-            const bVal = c.sortBy ? c.sortBy(b) : b[c.active];
-            if (aVal == null) {
-                if (bVal == null)
-                    return 0;
-                return nullValue;
-            }
-            if (bVal == null)
-                return -nullValue;
-            if (aVal < bVal)
-                return c.direction === 'asc' ? -1 : 1;
-            if (aVal > bVal)
-                return c.direction === 'asc' ? 1 : -1;
-        }
-        return 0;
-    };
-}
-
 const _sortAndFilterData = (data, sortState, filterState) => combineLatest([
     data.pipe(timestamp()),
     sortState.pipe(timestamp()),
@@ -4760,103 +4818,58 @@ const createDataCleaners = (metadatas, mutate = false) => {
 };
 const createCleaners = (metadatas) => {
     return metadatas.reduce((transforms, metaData) => {
-        const notNestedKey = metaData.key;
+        const getter = getFactory(metaData.key);
+        const setter = metaData.key.includes('.') ? (t, val) => set(t, metaData.key, val) : (t, val) => t[metaData.key] = val;
         switch (metaData.fieldType) {
             case FieldType.Currency:
             case FieldType.Number: {
-                const nested = metaData.key.includes('.');
-                if (nested) {
-                    transforms.push((t) => {
-                        const val = get(t, metaData.key);
-                        const num = Number(val);
-                        set(t, metaData.key, isNaN(num) || val == null ? null : num);
-                    });
-                }
-                else {
-                    transforms.push((t) => {
-                        const val = t[notNestedKey];
-                        const num = Number(val);
-                        t[notNestedKey] = (isNaN(num) || val == null ? null : num);
-                    });
-                }
+                const transform = (t) => {
+                    const val = getter(t);
+                    const num = Number(val);
+                    setter(t, isNaN(num) || val == null ? null : num);
+                };
+                transforms.push(transform);
                 break;
             }
             case FieldType.Date: {
-                const nested = metaData.key.includes('.');
-                if (nested) {
-                    transforms.push((t) => {
-                        const val = get(t, metaData.key);
-                        const date = Date.parse(val);
-                        if (isNaN(date)) {
-                            set(t, metaData.key, null);
-                            return;
-                        }
-                        const d = new Date(date);
-                        d.setHours(0, 0, 0, 0);
-                        set(t, metaData.key, d);
-                    });
-                }
-                else {
-                    transforms.push((t) => {
-                        const val = t[notNestedKey];
-                        const date = Date.parse(val);
-                        if (isNaN(date)) {
-                            t[notNestedKey] = null;
-                            return;
-                        }
-                        const d = new Date(date);
-                        d.setHours(0, 0, 0, 0);
-                        t[notNestedKey] = d;
-                    });
-                }
+                const transform = (t) => {
+                    const val = getter(t);
+                    const date = Date.parse(val);
+                    let mappedDate;
+                    if (isNaN(date)) {
+                        mappedDate = null;
+                    }
+                    else {
+                        mappedDate = new Date(date);
+                        mappedDate.setHours(0, 0, 0, 0);
+                    }
+                    setter(t, mappedDate);
+                };
+                transforms.push(transform);
                 break;
             }
             case FieldType.DateTime: {
-                const nested = metaData.key.includes('.');
-                if (nested) {
-                    transforms.push((t) => {
-                        const val = get(t, metaData.key);
-                        const dateTime = Date.parse(val);
-                        if (isNaN(dateTime)) {
-                            set(t, metaData.key, null);
-                            return;
-                        }
-                        const dt = new Date(dateTime);
-                        if (metaData.additional?.dateTimeOptions?.includeMilliseconds) {
-                            set(t, metaData.key, dt);
-                            return;
-                        }
-                        if (metaData.additional?.dateTimeOptions?.includeSeconds) {
-                            dt.setMilliseconds(0);
-                            set(t, metaData.key, dt);
-                            return;
-                        }
-                        dt.setSeconds(0, 0);
-                        set(t, metaData.key, dt);
-                    });
-                }
-                else {
-                    transforms.push((t) => {
-                        const val = t[notNestedKey];
-                        const dateTime = Date.parse(val);
-                        if (isNaN(dateTime)) {
-                            t[notNestedKey] = null;
-                            return;
-                        }
-                        const dt = new Date(dateTime);
-                        if (metaData.additional?.dateTimeOptions?.includeMilliseconds) {
-                            t[notNestedKey] = dt;
-                            return;
-                        }
-                        if (metaData.additional?.dateTimeOptions?.includeSeconds) {
-                            dt.setMilliseconds(0);
-                            t[notNestedKey] = dt;
-                            return;
+                const transform = (t) => {
+                    const val = getter(t);
+                    const date = Date.parse(val);
+                    let mappedDate;
+                    if (isNaN(date)) {
+                        mappedDate = null;
+                    }
+                    else {
+                        mappedDate = new Date(date);
+                        if (!metaData.additional?.dateTimeOptions?.includeMilliseconds) {
+                            if (metaData.additional?.dateTimeOptions?.includeSeconds) {
+                                mappedDate.setMilliseconds(0);
+                            }
+                            else {
+                                mappedDate.setSeconds(0, 0);
+                            }
                         }
-                        dt.setSeconds(0, 0);
-                        t[notNestedKey] = dt;
-                    });
-                }
+                    }
+                    setter(t, mappedDate);
+                };
+                transforms.push(transform);
             }
         }
         return transforms;
@@ -5931,6 +5944,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImpor
                         MatButtonModule, MatMenuModule, MatIconModule, MatTooltipModule, VirtualScrollContainer
                     ], template: "@let tableId = $tableId();\r\n@let tableSettings = state.$tableSettings();\r\n\r\n<ng-content select=\"[before]\" />\r\n<ng-container multiSort>\r\n  <div class=\"tb-header-wrapper\" [id]=\"headerId\">\r\n    <div class=\"title\">\r\n      @if ((!$collapsedHeader()) || tableSettings.showTitleWhenHeaderCollapsed)\r\n      {\r\n        <ng-content select=\".tb-header-title\"/>\r\n      }\r\n    </div>\r\n    @if(state.$groupByKeys().length){\r\n      <group-by-list />\r\n    }\r\n    <div class=\"flx-row-end\">\r\n      <lib-filter-list />\r\n      @if (!tableSettings.hideHeader)\r\n      {\r\n        @if (!$collapsedHeader())\r\n        {\r\n          <ng-container *ngTemplateOutlet=\"headerMenu\"/>\r\n          <button mat-icon-button color='primary' [matMenuTriggerFor]=\"l.menu()\">\r\n            <mat-icon>more_vert</mat-icon>\r\n          </button>\r\n\r\n          <lib-table-header-menu #l/>\r\n\r\n        }\r\n        @else {\r\n          <mat-icon color=\"primary\" [matMenuTriggerFor]=\"mainMenu\" class=\"flat-menu-button pointer\">more_horiz</mat-icon>\r\n          <mat-menu #mainMenu='matMenu'>\r\n            <div class=\"flex-column\">\r\n              <ng-container *ngTemplateOutlet=\"headerMenu; injector menuInjector\"/>\r\n            </div>\r\n            <lib-table-header-menu />\r\n          </mat-menu>\r\n        }\r\n        <mat-icon [matTooltip]=\"$collapsedHeader() ? 'expand' : 'collapse'\" class=\"collapse-icon header\"\r\n          (click)=\"state.toggleCollapseHeader()\">\r\n          {{$collapsedHeader() ? 'expand_less' : 'expand_more'}}\r\n        </mat-icon>\r\n      }\r\n\r\n    </div>\r\n  </div>\r\n\r\n  @if($useVirtual())\r\n  {\r\n    <tb-virtual-scroll-container class=\"scrollable\">\r\n      <tb-generic-table [rows]=\"$customRows()\" [data]=\"$data()!\" [displayDataLength]=\"$displayDataLength()\"\r\n        (selection)='selection$.emit($event)' [columnInfos]='$myColumns()' [trackBy]=\"$trackBy()\" [dataSource]=\"dataSource\" />\r\n    </tb-virtual-scroll-container>\r\n  }\r\n  @else\r\n  {\r\n    <tb-generic-table [rows]=\"$customRows()\" [data]=\"$data()!\" [displayDataLength]=\"$displayDataLength()\"\r\n      (selection)='selection$.emit($event)' [columnInfos]='$myColumns()' [trackBy]=\"$trackBy()\"  [dataSource]=\"dataSource\" />\r\n  }\r\n  @if(tableSettings.usePaginator)\r\n  {\r\n    <div class=\"paginator\">\r\n      <tb-paginator #tbPaginator />\r\n\r\n      <mat-icon [matTooltip]=\"$collapsedFooter() ? 'expand' : 'collapse'\" class=\"collapse-icon footer\"\r\n        (click)=\"state.toggleCollapseFooter()\">\r\n        {{$collapsedFooter() ? 'expand_more' : 'expand_less'}}\r\n      </mat-icon>\r\n    </div>\r\n  }\r\n\r\n  <ng-template #headerMenu>\r\n    @if (!tableSettings.hideFilter) {<tb-filter-displayer/>}\r\n    @if (!tableSettings.hideColumnSettings) {<tb-col-displayer/>}\r\n    @if (!tableSettings.hideSort) {<tb-sort-menu/>}\r\n    @if (!!tableId) {<tb-profiles-menu [tableId]=\"tableId\"/>}\r\n  </ng-template>\r\n\r\n</ng-container>\r\n", styles: [".tb-header-wrapper{display:flex;flex-direction:row;width:100%}.flx-row-end{display:flex;flex-direction:row;justify-content:flex-end;align-items:center;margin-left:auto}.flat-menu{line-height:initial;height:initial}.pointer{cursor:pointer}.add-key{width:90%}.paginator{display:flex;flex-direction:row;justify-content:flex-end;align-items:center;background-color:#fff;bottom:0;position:sticky;border-top:.5px solid rgba(0,0,0,.12)}.profiles-menu{visibility:hidden;width:0px;height:0px;display:block;overflow:hidden;position:absolute;top:50px}\n", ".collapse-icon{font-size:16px;height:16px;color:#3f51b5;align-self:flex-start}.collapse-icon:hover{cursor:pointer}.hide{display:none}.paginator-row{display:flex;align-items:center}\n"] }]
         }] });
+function isFunction(a) {
+    return typeof a === 'function';
+}
 
 class TableBuilderModule {
     static forRoot(config) {