@acorex-platform/framework-client 0.0.57 → 0.0.58

package/fesm2022/acorex-platform-framework-client-common.mjs

@@ -7,7 +7,7 @@ export { commandMessageTextForError } from '@acorex-platform/framework-client/au
 import { combineLatest, map, distinctUntilChanged, Subject, ReplaySubject, firstValueFrom, filter, take, timer, timeout, switchMap, from, of } from 'rxjs';
 import { unwrapValueProperty, isLocaleStringMap, coerceUnknownToDate, coerceUnknownToFiniteNumber, coerceUnknownToBoolean, coerceUnknownToTrimmedString, AXPPlatformScope, runtimeQueryPayloadData, runtimeCommandPayloadData, AXPRegionalSetting, AXPWidgetsCatalog, axpResolveUserNotificationDelivery, resolveMultiLanguageString, coerceUnknownToMultiLanguageString, AXPKeyboardShortcutPriority, AXP_PLATFORM_ERROR_CODES, AXPRequestError, mapUnknownToAXPErrorBody, AXPSystemActionType, runtimeQueryCollectionData, createRandomUuid, runtimeCommandFailure, runtimeCommandSuccessObject, runtimeQuerySuccessObject } from '@acorex-platform/framework-shared/core';
 import * as i4$2 from '@acorex-platform/framework-client/core';
-import { AXPDebugService, AXPBroadcastEventService, AXP_SETTINGS_DEFINITION_DIALOG_OPENER, objectKeyValueTransforms, AXPDataGenerator, AXPKeyboardShortcutRegistry, normalizeKeyboardShortcuts, AXPDeviceService, provideAppStartUpTask, AXP_APP_STARTUP_PRIORITY, chordToKbdItemKeys, hasForegroundOverlayLayer, AXPExpressionEvaluatorService, AXPContextEvalFactory, AXPModuleManifestModule, AXPComponentSlotModule, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXP_LOGO_IMAGE_SRC_RESOLVER, AXPHookService, AXPPageContextRegistry } from '@acorex-platform/framework-client/core';
+import { AXPDebugService, AXPBroadcastEventService, AXP_SETTINGS_DEFINITION_DIALOG_OPENER, objectKeyValueTransforms, AXPDataGenerator, AXPKeyboardShortcutRegistry, normalizeKeyboardShortcuts, AXPDeviceService, provideAppStartUpTask, AXP_APP_STARTUP_PRIORITY, chordToKbdItemKeys, AXPDialogOpener, hasForegroundOverlayLayer, AXPExpressionEvaluatorService, AXPContextEvalFactory, AXPModuleManifestModule, AXPComponentSlotModule, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXP_LOGO_IMAGE_SRC_RESOLVER, AXPHookService, AXPPageContextRegistry } from '@acorex-platform/framework-client/core';
 export { AXPDebugService } from '@acorex-platform/framework-client/core';
 import { merge, sortBy, isString, toString, isPlainObject, mergeWith, defaultTo, isEmpty, isEqual, cloneDeep, get, isNumber, isNil, isObject, omit, uniq } from 'lodash-es';
 import { AXPQueryService, AXPCommandService, provideCommandSetups, provideQuerySetups } from '@acorex-platform/framework-client/runtime';
@@ -9698,13 +9698,10 @@ class AXPKeyboardShortcutsHelpService {
     constructor() {
         //#region ---- Services & Dependencies ----
         this.popupService = inject(AXPopupService);
+        this.dialogOpener = inject(AXPDialogOpener);
         this.translationService = inject(AXTranslationService);
         this.shortcutRegistry = inject(AXPKeyboardShortcutRegistry);
         this.document = inject(DOCUMENT);
-        //#endregion
-        //#region ---- State ----
-        /** In-flight help popup session (open until the popup closes). */
-        this.activeShow = null;
         this.shortcutRegistry.setHelpDialogHandler(() => this.show());
     }
     //#endregion
@@ -9713,29 +9710,25 @@ class AXPKeyboardShortcutsHelpService {
      * Opens the keyboard shortcuts help popup, or no-ops when it is already open.
      */
     show() {
-        if (this.activeShow) {
-            return this.activeShow;
-        }
         if (typeof this.document !== 'undefined' && hasForegroundOverlayLayer(this.document)) {
             return Promise.resolve();
         }
-        this.activeShow = this.openHelpPopup().finally(() => {
-            this.activeShow = null;
-        });
-        return this.activeShow;
-    }
-    //#endregion
-    //#region ---- Private Methods ----
-    async openHelpPopup() {
-        const title = await this.translationService.translateAsync('@general:keyboard-shortcuts.help-title');
-        const component = await Promise.resolve().then(function () { return keyboardShortcutsHelp_component; }).then((module) => module.AXPKeyboardShortcutsHelpComponent);
-        await this.popupService.open(component, {
-            title,
-            size: 'sm',
-            closeButton: true,
-            closeOnBackdropClick: true,
-            draggable: false,
-        });
+        let title = '';
+        return this.dialogOpener
+            .openPopup({
+            load: () => Promise.resolve().then(function () { return keyboardShortcutsHelp_component; }).then((module) => module.AXPKeyboardShortcutsHelpComponent),
+            prepare: async () => {
+                title = await this.translationService.translateAsync('@general:keyboard-shortcuts.help-title');
+            },
+            show: (component) => this.popupService.open(component, {
+                title,
+                size: 'sm',
+                closeButton: true,
+                closeOnBackdropClick: true,
+                draggable: false,
+            }),
+        })
+            .then(() => undefined);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXPKeyboardShortcutsHelpService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXPKeyboardShortcutsHelpService, providedIn: 'root' }); }
@@ -13537,6 +13530,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
 class AXPExportService {
     constructor() {
         this.popupService = inject(AXPopupService);
+        this.dialogOpener = inject(AXPDialogOpener);
     }
     async generateBlobFromElement(element, blobOptions) {
         const domtoimage = (await import('dom-to-image')).default;
@@ -13547,15 +13541,19 @@ class AXPExportService {
             ({ popup, ...options } = blobOptions);
         }
         if (popup) {
-            const result = await this.popupService.open(AXMOrgChartPrintPage, {
-                header: true,
-                size: 'fit',
-                draggable: true,
-                hasBackdrop: true,
-                title: 'Export Options',
-                data: { data: options },
+            const result = await this.dialogOpener.openPopup({
+                load: () => Promise.resolve(AXMOrgChartPrintPage),
+                data: { popup: true },
+                show: (component) => this.popupService.open(component, {
+                    header: true,
+                    size: 'fit',
+                    draggable: true,
+                    hasBackdrop: true,
+                    title: 'Export Options',
+                    data: { data: options },
+                }),
             });
-            if (result.data.isCanceled) {
+            if (!result?.data || result.data.isCanceled) {
                 throw new Error('Process is Canceled by User!');
             }
             else {