@one-paragon/angular-utilities 2.2.7 → 2.2.8

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

@@ -6,7 +6,7 @@ import { isObservable, Subject, of, ReplaySubject, filter as filter$1, first, ma
 import { toObservable, toSignal, outputFromObservable } from '@angular/core/rxjs-interop';
 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 { merge as merge$1, sumBy, difference, groupBy, cloneDeep, intersection, set, get } from 'lodash';
 import { CdkColumnDef } from '@angular/cdk/table';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
@@ -4545,19 +4545,30 @@ class ExportToCsvService {
             const globalSettings = this.config?.defaultTableSettings?.tableSettings?.exportSettings
                 || this.config?.export
                 || {};
-            const globalLinkOptions = globalSettings.mapLinkOptions || {};
-            const flattenedGlobal = { ...globalSettings, ...globalLinkOptions };
             const tableSettings = (this.state.$notPersistedTableSettings()?.exportSettings || {});
-            const tableLinkOptions = tableSettings.mapLinkOptions || {};
-            const flattenedTable = { ...tableSettings, ...tableLinkOptions };
-            return merge$1(flattenedGlobal, flattenedTable);
+            return merge$1({}, globalSettings, tableSettings);
         });
         this.exportToCsv = (data) => {
             const hiddenKeys = this.state.selectSignal(s => s.hiddenKeys)();
             const meta = this.state.$metaDataArray().filter(md => !md.noExport && !hiddenKeys.includes(md.key));
-            const csv = this.csvData(data, meta);
+            const extraLinkCols = this.getExtraLinkCols(meta);
+            const csv = this.csvData(data, [...meta, ...extraLinkCols]);
             downloadData(csv, 'export.csv', 'text/csv');
         };
+        this.getExtraLinkCols = (meta) => {
+            return meta.filter(md => {
+                if (!md.additional?.link)
+                    return;
+                const exportForCol = merge$1({}, this.$exportSettings(), md.additional?.export);
+                return exportForCol.mapLink === 'add link';
+            }).map(md => {
+                const newCol = cloneDeep(md);
+                newCol.additional.export ??= {};
+                newCol.additional.export.mapLink = "as link",
+                    newCol.displayName = newCol.additional.export.linkColumnName || ((newCol.displayName || newCol.key) + ' - (Link)');
+                return newCol;
+            });
+        };
         this.csvData = (data, metaData) => {
             const res = data.map(row => metaData.map(meta => this.metaToField(meta, row)).join(','));
             res.unshift(metaData.map(meta => meta.displayName || meta.key).join(','));
@@ -4575,15 +4586,13 @@ class ExportToCsvService {
                 const transform = meta.transform;
                 return isPipe(transform) ? transform.transform(val) : transform(val);
             }
-            if (meta.additional?.link && exportForCol.mapLinkToString) {
+            if (meta.additional?.link && exportForCol.mapLink === 'as link') {
                 let mapper = this.state.$getLinkInfo(meta)()?.link;
                 if (mapper) {
                     let mapped = mapper(row);
                     if (exportForCol.domainPrefix) {
-                        mapped = `${exportForCol.domainPrefix}/${mapped}`;
-                    }
-                    if (exportForCol.excellStyle) {
-                        mapped = this.cleanValForCsv(`=hyperlink("${mapped}", "${this.stringByType(meta, row, val, exportForCol)}")`);
+                        const bet = mapped.startsWith('/') ? '' : '/';
+                        mapped = `${exportForCol.domainPrefix}${bet}${mapped}`;
                     }
                     return mapped;
                 }