@maro-tech/card 0.2.7 → 0.2.8

package/fesm2022/maro-tech-card.mjs

@@ -9,7 +9,7 @@ import { DomSanitizer } from '@angular/platform-browser';
 import Panzoom from '@panzoom/panzoom';
 import { LucideDownload, LucideDynamicIcon, LucideEye, LucideFileText, LucidePlus, LucideSparkles, LucideTrash } from '@lucide/angular';
 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
-import { map, shareReplay, forkJoin, switchMap, timer, of, firstValueFrom } from 'rxjs';
+import { map, shareReplay, forkJoin, switchMap, timer, of } from 'rxjs';
 import { UiTableComponent, UiPaginatorComponent } from '@maro-tech/table';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { map as map$1, exhaustMap, catchError, takeWhile, takeUntil, finalize } from 'rxjs/operators';
@@ -1623,7 +1623,6 @@ class HistoryTabComponent {
     destroyRef = inject(DestroyRef);
     refreshSequence = signal(0, ...(ngDevMode ? [{ debugName: "refreshSequence" }] : /* istanbul ignore next */ []));
     lastRequestKey = '';
-    dictionaryCache = new Map();
     constructor() {
         this.eventBus.on(ENTITY_UPDATED)
             .pipe(takeUntilDestroyed(this.destroyRef))
@@ -1749,8 +1748,8 @@ class HistoryTabComponent {
                         label: config.label || field,
                         type: config.type || 'text',
                         summary: values.summary,
-                        from: await this.toDisplayValue(values.from, config),
-                        to: await this.toDisplayValue(values.to, config),
+                        from: await this.toDisplayValue(values.from, config, values.from_data),
+                        to: await this.toDisplayValue(values.to, config, values.to_data),
                     };
                 }
                 return { ...change, changedFields };
@@ -1764,6 +1763,8 @@ class HistoryTabComponent {
             return [key, {
                     from: from && typeof from === 'object' && 'value' in from ? from.value : from,
                     to: to && typeof to === 'object' && 'value' in to ? to.value : to,
+                    from_data: field?.from_data,
+                    to_data: field?.to_data,
                     summary: typeof field?.changeSummary === 'string' ? field.changeSummary : undefined,
                 }];
         }));
@@ -1778,10 +1779,10 @@ class HistoryTabComponent {
         }
         return undefined;
     }
-    async toDisplayValue(value, config) {
+    async toDisplayValue(value, config, data) {
         const display = config.type === 'boolean' && value !== null && value !== undefined && value !== ''
             ? (value === true || value === 'true' || value === 1 ? 'Так' : 'Ні')
-            : await this.resolveDisplay(value, config);
+            : await this.resolveDisplay(value, config, data);
         const structured = config.displayMode === 'structured' ? await this.toStructuredItems(value, config.itemFields) : undefined;
         const result = {
             value: value ?? null,
@@ -1794,23 +1795,24 @@ class HistoryTabComponent {
             result.url = `/api/files/${encodeURIComponent(String(value))}`;
         return result;
     }
-    async resolveDisplay(value, config) {
+    async resolveDisplay(value, config, data) {
         if (value === null || value === undefined || value === '')
             return 'Не задано';
+        const dataLabel = this.getDataLabel(data);
+        if (dataLabel !== null)
+            return dataLabel;
         const values = Array.isArray(value) ? value : [value];
-        return (await Promise.all(values.map(async (item) => config.data && item !== null && item !== undefined && item !== ''
-            ? this.resolveDictionary(config.data, String(item))
-            : typeof item === 'object' ? JSON.stringify(item) : String(item)))).filter(Boolean).join(', ') || 'Не задано';
-    }
-    resolveDictionary(name, key) {
-        const cacheKey = `${name}:${key}`;
-        const cached = this.dictionaryCache.get(cacheKey);
-        if (cached)
-            return cached;
-        const request = firstValueFrom(this.http.get(cardApiResourceUrl(this.baseUrl, `/api/suggest/${encodeURIComponent(name)}/${encodeURIComponent(key)}`)))
-            .then((item) => item?.label || key).catch(() => key);
-        this.dictionaryCache.set(cacheKey, request);
-        return request;
+        return values
+            .filter((item) => item !== null && item !== undefined && item !== '')
+            .map((item) => typeof item === 'object' ? JSON.stringify(item) : String(item))
+            .filter(Boolean).join(', ') || 'Не задано';
+    }
+    getDataLabel(data) {
+        const values = Array.isArray(data) ? data : [data];
+        const labels = values
+            .map((item) => item && typeof item === 'object' && 'label' in item ? String(item.label ?? '') : '')
+            .filter(Boolean);
+        return labels.length ? labels.join(', ') : null;
     }
     async toStructuredItems(value, itemFields) {
         const values = Array.isArray(value) ? value : value && typeof value === 'object' ? [value] : [];
@@ -1831,7 +1833,8 @@ class HistoryTabComponent {
                     if (value === null || value === undefined || value === '' || seenLabels.has(label))
                         return null;
                     seenLabels.add(label);
-                    const display = fieldConfig.data ? await this.resolveDictionary(fieldConfig.data, String(value)) : typeof value === 'object' ? JSON.stringify(value) : String(value);
+                    const display = this.getDataLabel(record[`${key}_data`])
+                        || (typeof value === 'object' ? JSON.stringify(value) : String(value));
                     return { key, label, value, display };
                 }))).filter((field) => field !== null),
             };