@acorex/platform 20.2.4-next.9 → 20.3.0-next.0

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

@@ -28,7 +28,7 @@ import { AXFormatService, AXFormatModule } from '@acorex/core/format';
 import { AXPSessionService } from '@acorex/platform/auth';
 import { isNil, isEmpty, isEqual, cloneDeep } from 'lodash-es';
 import { AXBasePageComponent } from '@acorex/components/page';
-import { getChangedPaths, getSmart, AXPExpressionEvaluatorService } from '@acorex/platform/core';
+import { getChangedPaths, getSmart, AXPExpressionEvaluatorService, AXPBroadcastEventService } from '@acorex/platform/core';
 import * as i6$1 from '@acorex/platform/layout/builder';
 import { AXPPageStatus, AXPWidgetContainerComponent, AXPLayoutBuilderModule } from '@acorex/platform/layout/builder';
 import { Router, ActivatedRoute } from '@angular/router';
@@ -45,6 +45,7 @@ import * as i7 from '@acorex/components/form';
 import { AXFormModule } from '@acorex/components/form';
 import * as i5$1 from '@acorex/components/tabs';
 import { AXTabsModule } from '@acorex/components/tabs';
+import { Subject, takeUntil } from 'rxjs';
 
 class AXPPageLayoutBase {
 }
@@ -577,7 +578,7 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
                 rootContext: cloneDeep(adapterContext),
             });
         },
-        async loadPage(pageId) {
+        async loadPage(pageId, forceRefresh) {
             const adapter = store.adapter();
             if (!adapter) {
                 throw new Error('Adapter must be loaded before loading page');
@@ -607,7 +608,7 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
             let context = {};
             if (currentPage) {
                 const currentPageIndex = adapter.pages.findIndex((p) => p.id === currentPage.id);
-                const loadResult = await adapter.pages[currentPageIndex]?.load?.(store.rootContext());
+                const loadResult = await adapter.pages[currentPageIndex]?.load?.({ forceRefresh });
                 context = loadResult?.result ?? {};
             }
             // Set current tab to first tab of the current page (internal state only)
@@ -836,10 +837,21 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
                 patchState(store, {
                     previousContext: store.context(),
                 });
+                // After successful save, force refresh the rootContext and reload the current page
+                try {
+                    await this.loadPage(store.currentPage()?.id, true);
+                }
+                catch (error) {
+                    console.error('Failed to refresh page after save', error);
+                }
                 toastService.show({
                     color: 'success',
-                    title: await translateService.translateAsync('actions.accept.title', { scope: 'general' }),
-                    content: await translateService.translateAsync('actions.accept.message', { scope: 'general' }),
+                    title: await translateService.translateAsync('messages.generic.success.title', {
+                        scope: 'general',
+                    }),
+                    content: await translateService.translateAsync('messages.generic.success.description', {
+                        scope: 'general',
+                    }),
                     location: 'bottom-center',
                     closeButton: true,
                     timeOut: 3000,
@@ -851,7 +863,9 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
             });
         },
         goToListPage() {
-            //TODO: Implement
+            if (store.adapter()?.exitUrl) {
+                router.navigate([store.adapter()?.exitUrl]);
+            }
         },
     };
 }));
@@ -862,6 +876,10 @@ class AXPLayoutDetailsViewComponent extends AXPPageLayoutBaseComponent {
         this.adapter = input.required(...(ngDevMode ? [{ debugName: "adapter" }] : []));
         //
         this.vm = inject(AXPLayoutDetailsViewViewModel);
+        this.router = inject(Router);
+        this.route = inject(ActivatedRoute);
+        this.eventService = inject(AXPBroadcastEventService);
+        this.destroyed$ = new Subject();
         this.form = viewChild('form', ...(ngDevMode ? [{ debugName: "form" }] : []));
         this.widgetContainer = viewChild(AXPWidgetContainerComponent, ...(ngDevMode ? [{ debugName: "widgetContainer" }] : []));
         this.footerPrimaryActions = signal([], ...(ngDevMode ? [{ debugName: "footerPrimaryActions" }] : []));
@@ -886,10 +904,31 @@ class AXPLayoutDetailsViewComponent extends AXPPageLayoutBaseComponent {
             this.footerSecondaryActions.set(footerSecondaryActions);
         }, ...(ngDevMode ? [{ debugName: "#FooterActionsEffect" }] : []));
     }
+    /**
+     * Append timestamp query param to trigger router to re-run guards/resolvers
+     */
+    async refreshLayout() {
+        const router = this.router;
+        const route = this.route;
+        const now = Date.now();
+        await router.navigate([], {
+            relativeTo: route,
+            queryParams: { _ts: now },
+            queryParamsHandling: 'merge',
+        });
+    }
     async ngOnInit() {
         await super.ngOnInit();
         //
         await this.vm.load(this.adapter());
+        this.eventService
+            .listen('REFRESH_LAYOUT')
+            .pipe(takeUntil(this.destroyed$))
+            .subscribe((e) => {
+            if (e.data.name == this.vm.adapter()?.name) {
+                this.refreshLayout();
+            }
+        });
     }
     async ngAfterViewInit() {
         const listWidget = (await this.widgetContainer()?.find('page-list_table'));
@@ -905,6 +944,8 @@ class AXPLayoutDetailsViewComponent extends AXPPageLayoutBaseComponent {
     }
     ngOnDestroy() {
         this.onSelectionChangeSubscription?.unsubscribe();
+        this.destroyed$.next();
+        this.destroyed$.complete();
     }
     #FooterActionsEffect;
     handleOnContextChanged(e) {