@acorex-platform/framework-client 0.0.57 → 0.0.58

package/fesm2022/acorex-platform-framework-client-layout-designer.mjs

@@ -15,6 +15,7 @@ import { AXPopupService } from '@acorex/components/popup';
 import { AXToastService } from '@acorex/components/toast';
 import { AXFileService } from '@acorex/core/file';
 import { AXPWidgetsCatalog, AXPPlatformScope, AXPKeyboardShortcutPriority } from '@acorex-platform/framework-shared/core';
+import { AXPDialogOpener } from '@acorex-platform/framework-client/layout/builder';
 import { AXPBroadcastEventService, AXPDataGenerator, AXPHookService, AXPKeyboardShortcutRegistry, chordToKbdItemKeys, AXPLogoComponent } from '@acorex-platform/framework-client/core';
 import { isEqual, cloneDeep, assign, sortBy, get, set, isNil, isEmpty, orderBy, castArray, uniqBy, merge } from 'lodash-es';
 import { Subject, distinctUntilChanged, filter, debounceTime, first, merge as merge$1 } from 'rxjs';
@@ -529,25 +530,36 @@ function designerSurfaceHasDrawer(profile, drawer) {
 class AXPWidgetPickerService {
     constructor() {
         this.popupService = inject(AXPopupService);
+        this.dialogOpener = inject(AXPDialogOpener);
         this.widgetRegistryService = inject(AXPWidgetRegistryService);
         this.translationService = inject(AXTranslationService);
     }
     async showPicker(options) {
-        const com = await Promise.resolve().then(function () { return widgetPicker_component; }).then((c) => c.AXPDesignerWidgetPickerComponent);
         const widgets = this.widgetRegistryService.all();
         const filteredWidgets = widgets.filter((widget) => this.matchesPickerOptions(widget, options));
-        //
-        const result = await this.popupService.open(com, {
-            title: await this.translationService.translateAsync('@form-template-management:designer.components.widget-picker.title'),
-            size: 'md',
-            closeButton: true,
+        let title = '';
+        const result = await this.dialogOpener.openPopup({
+            load: () => Promise.resolve().then(function () { return widgetPicker_component; }).then((c) => c.AXPDesignerWidgetPickerComponent),
             data: {
-                widgets: sortBy(filteredWidgets, (c) => c.title),
                 tabPersistenceContext: options.tabPersistenceContext,
+                groups: options.groups ?? null,
+                profileId: options.profile?.id ?? null,
+            },
+            prepare: async () => {
+                title = await this.translationService.translateAsync('@form-template-management:designer.components.widget-picker.title');
             },
+            show: (component) => this.popupService.open(component, {
+                title,
+                size: 'md',
+                closeButton: true,
+                data: {
+                    widgets: sortBy(filteredWidgets, (c) => c.title),
+                    tabPersistenceContext: options.tabPersistenceContext,
+                },
+            }),
         });
         //
-        const selectedWidgets = (result.data?.widgets ?? []);
+        const selectedWidgets = (result?.data?.widgets ?? []);
         return selectedWidgets.map((c) => ({
             type: c.name,
             options: c.options,
@@ -674,6 +686,7 @@ class AXPDesignerService {
     #ef;
     constructor() {
         this.popupService = inject(AXPopupService);
+        this.dialogOpener = inject(AXPDialogOpener);
         this.toastService = inject(AXToastService);
         this.fileService = inject(AXFileService);
         this.loadingService = inject(AXLoadingDialogService);
@@ -1476,14 +1489,17 @@ class AXPDesignerService {
     }
     async openPreviewDialog() {
         this.updatePreview();
-        const com = await Promise.resolve().then(function () { return preview_component; }).then((c) => c.AXPLayoutDesignerPreviewComponent);
-        await this.popupService.open(com, {
-            header: false,
-            size: 'full',
-            data: {
-                initialSize: this.size(),
-                isDialogWindow: true,
-            },
+        await this.dialogOpener.openPopup({
+            load: () => Promise.resolve().then(function () { return preview_component; }).then((c) => c.AXPLayoutDesignerPreviewComponent),
+            data: { templateId: this.templateId() ?? null },
+            show: (component) => this.popupService.open(component, {
+                header: false,
+                size: 'full',
+                data: {
+                    initialSize: this.size(),
+                    isDialogWindow: true,
+                },
+            }),
         });
     }
     openPreviewWindow() {