@acorex/platform 20.9.5 → 20.9.8

package/fesm2022/acorex-platform-layout-widget-core.mjs

@@ -3,7 +3,7 @@ import { signal, computed, effect, untracked, Injectable, inject, ElementRef, De
 import { isSelectionValueEqual, isFormValueEqual, extractValue, getSmart, summarizeFormContextDirtyDiff, AXPWidgetsCatalog } from '@acorex/platform/contracts';
 import { AXPPageStatus, AXPWidgetStatus, AXP_WIDGET_TOKEN, AXP_WIDGET_COLUMN_TOKEN, createStringProperty, createBooleanProperty, createSelectProperty, createNumberProperty, cloneProperty } from '@acorex/platform/layout/widget-core-contracts';
 import { convertArrayToDataSource, AXDataSource, AX_STYLE_COLOR_TYPES, AX_STYLE_LOOK_TYPES } from '@acorex/cdk/common';
-import { AXPContextStore, AXPDebugService, FORM_DIRTY_TRACE_NS, AXPDataSourceDefinitionProviderService, AXPExpressionEvaluatorService, OVERLAY_WIDGET_SETTLE_TRACE_NS } from '@acorex/platform/core';
+import { AXPContextStore, AXPDebugService, FORM_DIRTY_TRACE_NS, AXPDataSourceQueryService, AXPExpressionEvaluatorService, OVERLAY_WIDGET_SETTLE_TRACE_NS } from '@acorex/platform/core';
 import { set, get, cloneDeep, isEqual, isNil, isUndefined, isObjectLike, merge, sum, isEmpty, isString } from 'lodash-es';
 import { Subject, BehaviorSubject, filter } from 'rxjs';
 import * as i1$1 from '@acorex/components/skeleton';
@@ -504,14 +504,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
 class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
     constructor() {
         super(...arguments);
-        this.dataService = inject(AXPDataSourceDefinitionProviderService);
+        this.registryDataSourceQuery = inject(AXPDataSourceQueryService);
         this.textField = computed(() => this.options()['textField'] ?? 'title', ...(ngDevMode ? [{ debugName: "textField" }] : /* istanbul ignore next */ []));
         this.valueField = computed(() => this.options()['valueField'] ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : /* istanbul ignore next */ []));
         this.textTemplate = computed(() => isNil(this.options()['textTemplate'])
             ? undefined
             : this.options()['textTemplate'].replace(/{/g, '{{').replace(/}/g, '}}'), ...(ngDevMode ? [{ debugName: "textTemplate" }] : /* istanbul ignore next */ []));
         this.dataSource = signal(convertArrayToDataSource([]), ...(ngDevMode ? [{ debugName: "dataSource" }] : /* istanbul ignore next */ []));
+        /** Registry datasource name from options, when options.dataSource is a string or `{ id }` object. */
+        this.registryDataSourceName = computed(() => {
+            const rawValue = this.options()['dataSource'];
+            if (typeof rawValue === 'string') {
+                return rawValue;
+            }
+            if (rawValue && typeof rawValue === 'object' && 'id' in rawValue) {
+                return String(rawValue['id']);
+            }
+            return null;
+        }, ...(ngDevMode ? [{ debugName: "registryDataSourceName" }] : /* istanbul ignore next */ []));
         this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : /* istanbul ignore next */ []));
+        /** Reactive flag: registry datasource finished resolving (success or failure). */
+        this.registryDataSourceReady = signal(false, ...(ngDevMode ? [{ debugName: "registryDataSourceReady" }] : /* istanbul ignore next */ []));
+        /** Reactive bump to reload registry-backed datasources (e.g. after locale change). */
+        this.registryRefreshEpoch = signal(0, ...(ngDevMode ? [{ debugName: "registryRefreshEpoch" }] : /* istanbul ignore next */ []));
         //#region ----   DataSource Loading Effect   ----
         /**
          * Track the last loaded string dataSource reference to prevent infinite loops
@@ -520,9 +535,14 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
         this.lastStringDataSourceRef = null;
         this.rf = effect(async () => {
             const rawValue = this.options()['dataSource'];
+            const registryId = this.registryDataSourceName();
+            this.registryRefreshEpoch();
             // For string datasources: prevent infinite loop by checking reference
             if (typeof rawValue === 'string') {
                 if (rawValue === this.lastStringDataSourceRef) {
+                    if (registryId) {
+                        this.registryDataSourceReady.set(true);
+                    }
                     return;
                 }
                 this.lastStringDataSourceRef = rawValue;
@@ -531,6 +551,9 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
                 // Reset string reference when dataSource changes to non-string
                 this.lastStringDataSourceRef = null;
             }
+            if (registryId) {
+                this.registryDataSourceReady.set(false);
+            }
             this.beginHydration();
             try {
                 // Process dataSource creation in untracked context
@@ -540,6 +563,7 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
                         if (!isEqual(rawValue.config, this.dataSource().config)) {
                             this.dataSource.set(rawValue);
                         }
+                        this.registryDataSourceReady.set(true);
                     }
                     // static array datasource - always recreate when options change
                     else if (Array.isArray(rawValue)) {
@@ -562,35 +586,24 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
                             },
                         });
                         this.dataSource.set(ds);
+                        this.registryDataSourceReady.set(true);
                     }
                     // resolve data source by name (string or object with id)
-                    else if (rawValue && (typeof rawValue == 'string' || typeof rawValue == 'object')) {
-                        const id = typeof rawValue == 'object' ? rawValue['id'] : rawValue;
-                        const c = await this.dataService.get(id);
-                        if (this.mode == 'designer' && c?.samples?.length) {
-                            this.dataSource.set(convertArrayToDataSource(c.samples, {
-                                key: this.valueField(),
-                                pageSize: 500,
-                            }));
+                    else if (registryId) {
+                        const queryOptions = this.buildRegistryQueryOptions();
+                        const result = await this.registryDataSourceQuery.resolve(registryId, queryOptions);
+                        if (result.dataSource) {
+                            this.dataSource.set(result.dataSource);
                         }
                         else {
-                            const ds = c?.source();
-                            if (ds && ds instanceof Promise) {
-                                const d = await ds;
-                                this.dataSource.set(d);
-                            }
-                            else if (ds) {
-                                this.dataSource.set(ds);
-                            }
-                            // empty datasource
-                            else {
-                                this.dataSource.set(convertArrayToDataSource([]));
-                            }
+                            this.dataSource.set(convertArrayToDataSource([]));
                         }
+                        this.registryDataSourceReady.set(true);
                     }
                     // empty datasource
                     else {
                         this.dataSource.set(convertArrayToDataSource([]));
+                        this.registryDataSourceReady.set(true);
                     }
                 });
             }
@@ -598,26 +611,51 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
                 this.endHydration();
             }
         }, ...(ngDevMode ? [{ debugName: "rf" }] : /* istanbul ignore next */ []));
-        this.effect2 = effect(async () => {
-            this.beginHydration();
-            try {
-                //TODO: WHY IS THIS HAPPENING
-                const value = this.resolveSelectedItemsValue();
-                const items = [];
-                if (Array.isArray(value)) {
-                    items.push(...(await Promise.all(value.map((item) => this.extractItem(item)))));
+        this.effect2 = effect(() => {
+            const registryName = this.registryDataSourceName();
+            const value = this.resolveSelectedItemsValue();
+            const registryReady = this.registryDataSourceReady();
+            this.dataSource();
+            if (registryName && !registryReady) {
+                return;
+            }
+            const resolveSelectedItems = async () => {
+                this.beginHydration();
+                try {
+                    const items = [];
+                    if (Array.isArray(value)) {
+                        items.push(...(await Promise.all(value.map((item) => this.extractItem(item)))));
+                    }
+                    else {
+                        items.push(await this.extractItem(value));
+                    }
+                    this.selectedItems.set(items.filter((c) => c != null));
                 }
-                else {
-                    items.push(await this.extractItem(value));
+                finally {
+                    this.endHydration();
                 }
-                this.selectedItems.set(items.filter((c) => c != null));
-            }
-            finally {
-                this.endHydration();
-            }
+            };
+            void resolveSelectedItems();
         }, ...(ngDevMode ? [{ debugName: "effect2" }] : /* istanbul ignore next */ []));
     }
+    buildRegistryQueryOptions() {
+        return {
+            valueField: this.valueField(),
+            useSamples: this.mode === 'designer',
+        };
+    }
     //#endregion
+    /** Invalidates cached registry datasource and forces a reload on the next effect run. */
+    refreshRegistryDataSource() {
+        const registryId = this.registryDataSourceName();
+        if (!registryId) {
+            return;
+        }
+        this.registryDataSourceQuery.invalidate(registryId);
+        this.lastStringDataSourceRef = null;
+        this.registryDataSourceReady.set(false);
+        this.registryRefreshEpoch.update((epoch) => epoch + 1);
+    }
     async extractItem(item) {
         if (isNil(item)) {
             return null;
@@ -626,6 +664,13 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
             return item;
         }
         const key = extractValue(item, this.valueField());
+        const registryName = this.registryDataSourceName();
+        if (registryName) {
+            const found = await this.registryDataSourceQuery.queryByKey(registryName, key, this.buildRegistryQueryOptions());
+            if (found) {
+                return found;
+            }
+        }
         const ds = this.dataSource();
         if (ds.config?.byKey) {
             const found = await ds.config?.byKey(key);
@@ -645,16 +690,10 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
      * widgets that wrap their value (e.g. filter mode) can override this to expose
      * the unwrapped scalar/array so item resolution receives a real key.
      */
-    //TODO: WHY IS THIS HAPPENING
     resolveSelectedItemsValue() {
         return this.getValue();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDataListWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDataListWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDataListWidgetComponent, decorators: [{
-            type: Injectable
-        }] });
 class AXPColumnWidgetComponent {
     constructor() {
         this.token = inject(AXP_WIDGET_COLUMN_TOKEN);