@acorex/platform 21.0.0-next.17 → 21.0.0-next.18

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -10882,6 +10882,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.list = viewChild('list', ...(ngDevMode ? [{ debugName: "list" }] : []));
         this.allWidgets = viewChildren(AXPWidgetRendererDirective, ...(ngDevMode ? [{ debugName: "allWidgets" }] : []));
         this.listWidget = linkedSignal(() => this.allWidgets().find((widget) => widget.node()?.type === AXPWidgetsCatalog.dataList), ...(ngDevMode ? [{ debugName: "listWidget" }] : []));
+        // Cached instance reference to ensure consistency with the first created instance
+        this.listWidgetInstance = signal(null, ...(ngDevMode ? [{ debugName: "listWidgetInstance" }] : []));
         this.toolbarWidget = computed(() => this.allWidgets().find((widget) => widget.node()?.type === AXPWidgetsCatalog.listToolbar), ...(ngDevMode ? [{ debugName: "toolbarWidget" }] : []));
         this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : []));
         this.toolbarNode = signal(null, ...(ngDevMode ? [{ debugName: "toolbarNode" }] : []));
@@ -10963,17 +10965,18 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             //TODO: this is a temporary solution to handle the query changes; this should be removed when the query changes are handled in the widget core;
             if (this.getValue()?.toolbar) {
                 this.queries = this.getValue()?.toolbar;
+                // Use cached instance or get from listWidget
+                const listInstance = this.listWidgetInstance() || this.listWidget()?.instance;
+                // const dataSource = this.listWidget()?.options()['dataSource'] as AXDataSource;
+                const dataSource = listInstance?.options()?.['dataSource'];
+                const isMounted = this.isMounted();
+                if (!this.hasRequiredDependencies(dataSource, this.queries, listInstance)) {
+                    return;
+                }
+                untracked(() => {
+                    this.handleQueryChanges(this.queries, dataSource, listInstance, isMounted);
+                });
             }
-            const listInstance = this.listWidget()?.instance;
-            // const dataSource = this.listWidget()?.options()['dataSource'] as AXDataSource;
-            const dataSource = listInstance?.options()?.['dataSource'];
-            const isMounted = this.isMounted();
-            if (!this.hasRequiredDependencies(dataSource, this.queries, listInstance)) {
-                return;
-            }
-            untracked(() => {
-                this.handleQueryChanges(this.queries, dataSource, listInstance, isMounted);
-            });
         }, ...(ngDevMode ? [{ debugName: "#effect" }] : []));
         //#endregion
         this.context = {};
@@ -11105,7 +11108,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         if (!changeTracker.isColumnsChanged) {
             return;
         }
-        const listInstance = this.listWidget()?.instance;
+        // Use cached instance or get from listWidget
+        const listInstance = this.listWidgetInstance() || this.listWidget()?.instance;
         const toolbarState = this.getValue()?.toolbar;
         if (!listInstance || !toolbarState?.columns) {
             return;
@@ -11171,7 +11175,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
             if (event.payload.entity == this.entitySource()) {
-                this.listWidget()?.instance.call('refresh');
+                const instance = this.listWidgetInstance() || this.listWidget()?.instance;
+                instance?.call('refresh');
             }
         });
         this.eventService
@@ -11179,21 +11184,36 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             .pipe(takeUntil(this.destroyed))
             .subscribe((e) => {
             if (e.data.name == `${this.entity()?.module}.${this.entity()?.name}`) {
-                this.listWidget()?.instance.call('refresh');
+                const instance = this.listWidgetInstance() || this.listWidget()?.instance;
+                instance?.call('refresh');
             }
         });
-        const listWidget = (await this.layoutService.waitForWidget(`${this.entitySource()}-tab-list_table`, 500));
-        if (listWidget?.api && typeof listWidget.api === 'function') {
-            const onSelectionChange = listWidget.api()['onSelectionChange'];
-            if (onSelectionChange) {
-                onSelectionChange.pipe(takeUntil(this.destroyed)).subscribe((e) => {
-                    this.selectedItems.set(e);
-                });
+        // Wait for the widget to be available using listWidget signal
+        // Poll until the widget instance is ready to ensure we use the first created instance
+        let attempts = 0;
+        const maxAttempts = 50; // 5 seconds max wait (50 * 100ms)
+        while (attempts < maxAttempts) {
+            const widgetDirective = this.listWidget();
+            if (widgetDirective?.instance) {
+                const listWidgetInstance = widgetDirective.instance;
+                // Cache the instance for consistent usage across all methods
+                this.listWidgetInstance.set(listWidgetInstance);
+                if (listWidgetInstance?.api && typeof listWidgetInstance.api === 'function') {
+                    const onSelectionChange = listWidgetInstance.api()['onSelectionChange'];
+                    if (onSelectionChange) {
+                        onSelectionChange.pipe(takeUntil(this.destroyed)).subscribe((e) => {
+                            this.selectedItems.set(e);
+                        });
+                    }
+                }
+                break;
             }
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            attempts++;
         }
     }
     ngOnDestroy() {
-        this.listWidget.set(undefined);
+        this.listWidgetInstance.set(null);
         this.destroyed.next();
         this.destroyed.complete();
     }