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

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

@@ -5275,6 +5275,9 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
         // Don't evaluate actions here - keep expression strings for lazy evaluation at execution time
         // This ensures actions use the latest context data when executed
         const actions = await evaluateExpressions(relatedEntity.actions);
+        console.time('tab-list-converter1');
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        console.timeEnd('tab-list-converter2');
         return {
             id: entityDef?.name ?? '',
             title: relatedEntity.title ?? entityDef?.title ?? '',
@@ -10882,8 +10885,6 @@ 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" }] : []));
@@ -10965,18 +10966,17 @@ 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 = {};
@@ -11108,8 +11108,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         if (!changeTracker.isColumnsChanged) {
             return;
         }
-        // Use cached instance or get from listWidget
-        const listInstance = this.listWidgetInstance() || this.listWidget()?.instance;
+        const listInstance = this.listWidget()?.instance;
         const toolbarState = this.getValue()?.toolbar;
         if (!listInstance || !toolbarState?.columns) {
             return;
@@ -11175,8 +11174,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
             if (event.payload.entity == this.entitySource()) {
-                const instance = this.listWidgetInstance() || this.listWidget()?.instance;
-                instance?.call('refresh');
+                this.listWidget()?.instance.call('refresh');
             }
         });
         this.eventService
@@ -11184,36 +11182,21 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             .pipe(takeUntil(this.destroyed))
             .subscribe((e) => {
             if (e.data.name == `${this.entity()?.module}.${this.entity()?.name}`) {
-                const instance = this.listWidgetInstance() || this.listWidget()?.instance;
-                instance?.call('refresh');
+                this.listWidget()?.instance.call('refresh');
             }
         });
-        // 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;
+        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);
+                });
             }
-            await new Promise((resolve) => setTimeout(resolve, 100));
-            attempts++;
         }
     }
     ngOnDestroy() {
-        this.listWidgetInstance.set(null);
+        this.listWidget.set(undefined);
         this.destroyed.next();
         this.destroyed.complete();
     }