@sap-ux/preview-middleware 0.16.156 → 0.16.157

package/dist/client/adp/controllers/AddFragment.controller.js

@@ -39,7 +39,6 @@ sap.ui.define([
                 title: options.title,
                 completeView: options.aggregation === undefined
             });
-            this.ui5Version = sap.ui.version;
             this.commandExecutor = new CommandExecutor(this.rta);
         },
         setup: async function _setup(dialog) {

package/dist/client/adp/controllers/AddFragment.controller.ts

@@ -66,7 +66,6 @@ export default class AddFragment extends BaseDialog<AddFragmentModel> {
             title: options.title,
             completeView: options.aggregation === undefined
         });
-        this.ui5Version = sap.ui.version;
         this.commandExecutor = new CommandExecutor(this.rta);
     }
 

package/dist/client/adp/controllers/AddTableColumnFragments.controller.js

@@ -37,7 +37,6 @@ sap.ui.define([
             this.rta = rta;
             this.overlays = overlays;
             this.model = new JSONModel({ title: options.title });
-            this.ui5Version = sap.ui.version;
             this.commandExecutor = new CommandExecutor(this.rta);
         },
         setup: async function _setup(dialog) {

package/dist/client/adp/controllers/AddTableColumnFragments.controller.ts

@@ -66,7 +66,6 @@ export default class AddTableColumnFragments extends BaseDialog<AddTableColumnsF
         this.model = new JSONModel({
             title: options.title
         }) as AddTableColumnsFragmentsModel;
-        this.ui5Version = sap.ui.version;
         this.commandExecutor = new CommandExecutor(this.rta);
     }
 

package/dist/client/adp/controllers/BaseDialog.controller.ts

@@ -47,10 +47,6 @@ export default abstract class BaseDialog<T extends BaseDialogModel = BaseDialogM
      * Dialog instance
      */
     public dialog: Dialog;
-    /**
-     * UI5 version
-     */
-    public ui5Version: string;
     /**
      * RTA Command Executor
      */

package/dist/client/adp/dialog-factory.js

@@ -0,0 +1,115 @@
+"use strict";
+
+sap.ui.define(["sap/ui/core/Fragment", "../i18n", "./controllers/AddFragment.controller", "./controllers/AddTableColumnFragments.controller", "./controllers/ControllerExtension.controller", "./controllers/ExtensionPoint.controller"], function (Fragment, ___i18n, __AddFragment, __AddTableColumnFragments, __ControllerExtension, __ExtensionPoint) {
+  "use strict";
+
+  function _interopRequireDefault(obj) {
+    return obj && obj.__esModule && typeof obj.default !== "undefined" ? obj.default : obj;
+  }
+  const getTextBundle = ___i18n["getTextBundle"];
+  const AddFragment = _interopRequireDefault(__AddFragment);
+  const AddTableColumnFragments = _interopRequireDefault(__AddTableColumnFragments);
+  const ControllerExtension = _interopRequireDefault(__ControllerExtension);
+  const ExtensionPoint = _interopRequireDefault(__ExtensionPoint);
+  var DialogNames = /*#__PURE__*/function (DialogNames) {
+    DialogNames["ADD_FRAGMENT"] = "AddFragment";
+    DialogNames["ADD_TABLE_COLUMN_FRAGMENTS"] = "AddTableColumnFragments";
+    DialogNames["CONTROLLER_EXTENSION"] = "ControllerExtension";
+    DialogNames["ADD_FRAGMENT_AT_EXTENSION_POINT"] = "ExtensionPoint";
+    return DialogNames;
+  }(DialogNames || {});
+  const OPEN_DIALOG_STATUS_CHANGED = 'OPEN_DIALOG_STATUS_CHANGED';
+  class DialogFactory {
+    static eventTarget = new EventTarget();
+    static isDialogOpen = false;
+    /**
+     * Only one dialog can be open at a time. This flag indicates if a new dialog can be opened.
+     */
+
+    static get canOpenDialog() {
+      return !this.isDialogOpen;
+    }
+
+    /**
+     * Factory method for creating a new dialog.
+     *
+     * @param overlay - Control overlay.
+     * @param rta - Runtime Authoring instance.
+     * @param dialogName - Dialog name.
+     * @param extensionPointData - Control ID.
+     * @param options - Dialog options.
+     */
+    static async createDialog(overlay, rta, dialogName, extensionPointData) {
+      let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+      if (this.isDialogOpen) {
+        return;
+      }
+      let controller;
+      const resources = await getTextBundle();
+      switch (dialogName) {
+        case DialogNames.ADD_FRAGMENT:
+          controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
+            aggregation: options.aggregation,
+            title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
+          });
+          break;
+        case DialogNames.ADD_TABLE_COLUMN_FRAGMENTS:
+          controller = new AddTableColumnFragments(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
+            aggregation: options.aggregation,
+            title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
+          });
+          break;
+        case DialogNames.CONTROLLER_EXTENSION:
+          controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta);
+          break;
+        case DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT:
+          controller = new ExtensionPoint(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, extensionPointData);
+          break;
+      }
+      const id = dialogName === DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT ? `dialog--${dialogName}` : undefined;
+      const dialog = await Fragment.load({
+        name: `open.ux.preview.client.adp.ui.${dialogName}`,
+        controller,
+        id
+      });
+      this.isDialogOpen = true;
+      dialog.attachBeforeClose(() => {
+        this.updateStatus(false);
+      });
+      await controller.setup(dialog);
+      this.updateStatus(true);
+    }
+
+    /**
+     * Updates open dialog status.
+     * 
+     * @param isDialogOpen Flag indicating if there is an open dialog.
+     */
+    static updateStatus(isDialogOpen) {
+      this.isDialogOpen = isDialogOpen;
+      const event = new CustomEvent(OPEN_DIALOG_STATUS_CHANGED);
+      this.eventTarget.dispatchEvent(event);
+    }
+
+    /**
+     * Attach event handler for OPEN_DIALOG_STATUS_CHANGED event.
+     * 
+     * @param handler Event handler.
+     * @returns Function that removes listener.
+     */
+    static onOpenDialogStatusChange(handler) {
+      this.eventTarget.addEventListener(OPEN_DIALOG_STATUS_CHANGED, handler);
+      return () => {
+        this.eventTarget.removeEventListener(OPEN_DIALOG_STATUS_CHANGED, handler);
+      };
+    }
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.DialogNames = DialogNames;
+  __exports.OPEN_DIALOG_STATUS_CHANGED = OPEN_DIALOG_STATUS_CHANGED;
+  __exports.DialogFactory = DialogFactory;
+  return __exports;
+});
+//# sourceMappingURL=dialog-factory.js.map

package/dist/client/adp/dialog-factory.ts

@@ -0,0 +1,134 @@
+import Dialog from 'sap/m/Dialog';
+import UI5Element from 'sap/ui/core/Element';
+import Fragment from 'sap/ui/core/Fragment';
+import RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
+
+import { getTextBundle } from '../i18n';
+
+import AddFragment, { AddFragmentOptions } from './controllers/AddFragment.controller';
+import AddTableColumnFragments from './controllers/AddTableColumnFragments.controller';
+import ControllerExtension from './controllers/ControllerExtension.controller';
+import ExtensionPoint from './controllers/ExtensionPoint.controller';
+
+import { ExtensionPointData } from './extension-point';
+
+export const enum DialogNames {
+    ADD_FRAGMENT = 'AddFragment',
+    ADD_TABLE_COLUMN_FRAGMENTS = 'AddTableColumnFragments',
+    CONTROLLER_EXTENSION = 'ControllerExtension',
+    ADD_FRAGMENT_AT_EXTENSION_POINT = 'ExtensionPoint'
+}
+
+type Controller = AddFragment | AddTableColumnFragments | ControllerExtension | ExtensionPoint;
+
+export const OPEN_DIALOG_STATUS_CHANGED = 'OPEN_DIALOG_STATUS_CHANGED';
+
+export class DialogFactory {
+    private static readonly eventTarget = new EventTarget();
+    private static isDialogOpen = false;
+    /**
+     * Only one dialog can be open at a time. This flag indicates if a new dialog can be opened.
+     */
+
+    public static get canOpenDialog(): boolean {
+        return !this.isDialogOpen;
+    }
+
+    /**
+     * Factory method for creating a new dialog.
+     *
+     * @param overlay - Control overlay.
+     * @param rta - Runtime Authoring instance.
+     * @param dialogName - Dialog name.
+     * @param extensionPointData - Control ID.
+     * @param options - Dialog options.
+     */
+    public static async createDialog(
+        overlay: UI5Element,
+        rta: RuntimeAuthoring,
+        dialogName: DialogNames,
+        extensionPointData?: ExtensionPointData,
+        options: Partial<AddFragmentOptions> = {}
+    ): Promise<void> {
+        if (this.isDialogOpen) {
+            return;
+        }
+        let controller: Controller;
+        const resources = await getTextBundle();
+
+        switch (dialogName) {
+            case DialogNames.ADD_FRAGMENT:
+                controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
+                    aggregation: options.aggregation,
+                    title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
+                });
+                break;
+            case DialogNames.ADD_TABLE_COLUMN_FRAGMENTS:
+                controller = new AddTableColumnFragments(
+                    `open.ux.preview.client.adp.controllers.${dialogName}`,
+                    overlay,
+                    rta,
+                    {
+                        aggregation: options.aggregation,
+                        title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
+                    }
+                );
+                break;
+            case DialogNames.CONTROLLER_EXTENSION:
+                controller = new ControllerExtension(
+                    `open.ux.preview.client.adp.controllers.${dialogName}`,
+                    overlay,
+                    rta
+                );
+                break;
+            case DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT:
+                controller = new ExtensionPoint(
+                    `open.ux.preview.client.adp.controllers.${dialogName}`,
+                    overlay,
+                    rta,
+                    extensionPointData!
+                );
+                break;
+        }
+
+        const id = dialogName === DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT ? `dialog--${dialogName}` : undefined;
+
+        const dialog = (await Fragment.load({
+            name: `open.ux.preview.client.adp.ui.${dialogName}`,
+            controller,
+            id
+        })) as Dialog;
+
+        this.isDialogOpen = true;
+        dialog.attachBeforeClose(() => {
+            this.updateStatus(false);
+        });
+
+        await controller.setup(dialog);
+        this.updateStatus(true);
+    }
+
+    /**
+     * Updates open dialog status.
+     * 
+     * @param isDialogOpen Flag indicating if there is an open dialog.
+     */
+    private static updateStatus(isDialogOpen: boolean) {
+        this.isDialogOpen = isDialogOpen;
+        const event = new CustomEvent(OPEN_DIALOG_STATUS_CHANGED);
+        this.eventTarget.dispatchEvent(event);
+    }
+
+    /**
+     * Attach event handler for OPEN_DIALOG_STATUS_CHANGED event.
+     * 
+     * @param handler Event handler.
+     * @returns Function that removes listener.
+     */
+    public static onOpenDialogStatusChange(handler: (event: CustomEvent) => void | Promise<void>): () => void {
+        this.eventTarget.addEventListener(OPEN_DIALOG_STATUS_CHANGED, handler as EventListener);
+        return () => {
+            this.eventTarget.removeEventListener(OPEN_DIALOG_STATUS_CHANGED, handler as EventListener);
+        };
+    }
+}

package/dist/client/adp/extension-point.js

@@ -4,15 +4,15 @@ sap.ui.define([
     'sap/ui/rta/command/CommandFactory',
     'open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common',
     './utils',
-    '../cpe/communication-service',
-    './init-dialogs'
-], function (AddXMLAtExtensionPoint, CommandFactory, ___sap_ux_private_control_property_editor_common, ___utils, ___cpe_communication_service, ___init_dialogs) {
+    './dialog-factory',
+    '../cpe/communication-service'
+], function (AddXMLAtExtensionPoint, CommandFactory, ___sap_ux_private_control_property_editor_common, ___utils, ___dialog_factory, ___cpe_communication_service) {
     'use strict';
     const addExtensionPoint = ___sap_ux_private_control_property_editor_common['addExtensionPoint'];
     const createDeferred = ___utils['createDeferred'];
+    const DialogFactory = ___dialog_factory['DialogFactory'];
+    const DialogNames = ___dialog_factory['DialogNames'];
     const CommunicationService = ___cpe_communication_service['CommunicationService'];
-    const DialogNames = ___init_dialogs['DialogNames'];
-    const handler = ___init_dialogs['handler'];
     class ExtensionPointService {
         actionId = 'CTX_ADDXML_AT_EXTENSIONPOINT';
         constructor(rta) {
@@ -47,7 +47,7 @@ sap.ui.define([
         async fragmentHandler(overlay, info) {
             let deferred = createDeferred();
             const name = this.selectedExtensionPointName;
-            await handler(overlay, this.rta, DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT, {
+            await DialogFactory.createDialog(overlay, this.rta, DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT, {
                 name,
                 info,
                 deferred

package/dist/client/adp/extension-point.ts

@@ -7,9 +7,9 @@ import CommandFactory from 'sap/ui/rta/command/CommandFactory';
 import { ExternalAction, addExtensionPoint } from '@sap-ux-private/control-property-editor-common';
 
 import { Deferred, createDeferred } from './utils';
+import { DialogFactory, DialogNames } from './dialog-factory';
 
 import { CommunicationService } from '../cpe/communication-service';
-import { DialogNames, handler } from './init-dialogs';
 
 type ActionService = {
     execute: (controlId: string, actionId: string) => void;
@@ -100,7 +100,7 @@ export default class ExtensionPointService {
         let deferred = createDeferred<DeferredExtPointData>();
         const name = this.selectedExtensionPointName;
 
-        await handler(overlay, this.rta, DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT, {
+        await DialogFactory.createDialog(overlay, this.rta, DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT, {
             name,
             info,
             deferred

package/dist/client/adp/init-dialogs.js

@@ -1,24 +1,11 @@
 "use strict";
 
-sap.ui.define(["sap/ui/core/Fragment", "sap/ui/rta/util/hasStableId", "sap/ui/fl/Utils", "./controllers/AddFragment.controller", "./controllers/ControllerExtension.controller", "./controllers/ExtensionPoint.controller", "../cpe/utils", "../i18n", "./controllers/AddTableColumnFragments.controller"], function (Fragment, hasStableId, FlUtils, __AddFragment, __ControllerExtension, __ExtensionPoint, ___cpe_utils, ___i18n, __AddTableColumnFragments) {
+sap.ui.define(["sap/ui/rta/util/hasStableId", "sap/ui/fl/Utils", "../cpe/utils", "./dialog-factory"], function (hasStableId, FlUtils, ___cpe_utils, ___dialog_factory) {
   "use strict";
 
-  function _interopRequireDefault(obj) {
-    return obj && obj.__esModule && typeof obj.default !== "undefined" ? obj.default : obj;
-  }
-  const AddFragment = _interopRequireDefault(__AddFragment);
-  const ControllerExtension = _interopRequireDefault(__ControllerExtension);
-  const ExtensionPoint = _interopRequireDefault(__ExtensionPoint);
   const isReuseComponent = ___cpe_utils["isReuseComponent"];
-  const getTextBundle = ___i18n["getTextBundle"];
-  const AddTableColumnFragments = _interopRequireDefault(__AddTableColumnFragments);
-  var DialogNames = /*#__PURE__*/function (DialogNames) {
-    DialogNames["ADD_FRAGMENT"] = "AddFragment";
-    DialogNames["ADD_TABLE_COLUMN_FRAGMENTS"] = "AddTableColumnFragments";
-    DialogNames["CONTROLLER_EXTENSION"] = "ControllerExtension";
-    DialogNames["ADD_FRAGMENT_AT_EXTENSION_POINT"] = "ExtensionPoint";
-    return DialogNames;
-  }(DialogNames || {});
+  const DialogFactory = ___dialog_factory["DialogFactory"];
+  const DialogNames = ___dialog_factory["DialogNames"];
   /**
    * Handler for enablement of Extend With Controller context menu entry
    *
@@ -78,48 +65,6 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/rta/util/hasStableId", "sap/ui/fl
     return 'Add: Fragment';
   };
 
-  /**
-   * Handler for new context menu entry
-   *
-   * @param overlay Control overlays
-   * @param rta Runtime Authoring
-   * @param dialogName Dialog name
-   * @param extensionPointData Control ID
-   * @param options Dialog options
-   */
-  async function handler(overlay, rta, dialogName, extensionPointData) {
-    let options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
-    let controller;
-    const resources = await getTextBundle();
-    switch (dialogName) {
-      case DialogNames.ADD_FRAGMENT:
-        controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
-          aggregation: options.aggregation,
-          title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
-        });
-        break;
-      case DialogNames.ADD_TABLE_COLUMN_FRAGMENTS:
-        controller = new AddTableColumnFragments(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
-          aggregation: options.aggregation,
-          title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
-        });
-        break;
-      case DialogNames.CONTROLLER_EXTENSION:
-        controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta);
-        break;
-      case DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT:
-        controller = new ExtensionPoint(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, extensionPointData);
-        break;
-    }
-    const id = dialogName === DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT ? `dialog--${dialogName}` : undefined;
-    const dialog = await Fragment.load({
-      name: `open.ux.preview.client.adp.ui.${dialogName}`,
-      controller,
-      id
-    });
-    await controller.setup(dialog);
-  }
-
   /**
    * Adds a new item to the context menu
    *
@@ -132,14 +77,14 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/rta/util/hasStableId", "sap/ui/fl
     contextMenu.addMenuItem({
       id: 'ADD_FRAGMENT',
       text: getAddFragmentItemText,
-      handler: async overlays => await handler(overlays[0], rta, DialogNames.ADD_FRAGMENT),
+      handler: async overlays => await DialogFactory.createDialog(overlays[0], rta, DialogNames.ADD_FRAGMENT),
       icon: 'sap-icon://attachment-html',
       enabled: overlays => isFragmentCommandEnabled(overlays, ui5VersionInfo)
     });
     contextMenu.addMenuItem({
       id: 'EXTEND_CONTROLLER',
       text: 'Extend With Controller',
-      handler: async overlays => await handler(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
+      handler: async overlays => await DialogFactory.createDialog(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
       icon: 'sap-icon://create-form',
       enabled: overlays => isControllerExtensionEnabled(overlays, syncViewsIds, ui5VersionInfo)
     });
@@ -147,12 +92,10 @@ sap.ui.define(["sap/ui/core/Fragment", "sap/ui/rta/util/hasStableId", "sap/ui/fl
   var __exports = {
     __esModule: true
   };
-  __exports.DialogNames = DialogNames;
   __exports.isControllerExtensionEnabledForControl = isControllerExtensionEnabledForControl;
   __exports.isControllerExtensionEnabled = isControllerExtensionEnabled;
   __exports.isFragmentCommandEnabled = isFragmentCommandEnabled;
   __exports.getAddFragmentItemText = getAddFragmentItemText;
-  __exports.handler = handler;
   __exports.initDialogs = initDialogs;
   return __exports;
 });

package/dist/client/adp/init-dialogs.ts

@@ -1,8 +1,4 @@
-/** sap.m */
-import type Dialog from 'sap/m/Dialog';
-
 /** sap.ui.core */
-import Fragment from 'sap/ui/core/Fragment';
 import UI5Element from 'sap/ui/core/Element';
 
 /** sap.ui.rta */
@@ -15,24 +11,10 @@ import FlUtils from 'sap/ui/fl/Utils';
 /** sap.ui.dt */
 import type ElementOverlay from 'sap/ui/dt/ElementOverlay';
 
-import AddFragment, { AddFragmentOptions } from './controllers/AddFragment.controller';
-import ControllerExtension from './controllers/ControllerExtension.controller';
-import { ExtensionPointData } from './extension-point';
-import ExtensionPoint from './controllers/ExtensionPoint.controller';
 import ManagedObject from 'sap/ui/base/ManagedObject';
 import { isReuseComponent } from '../cpe/utils';
 import { Ui5VersionInfo } from '../utils/version';
-import { getTextBundle } from '../i18n';
-import AddTableColumnFragments from './controllers/AddTableColumnFragments.controller';
-
-export const enum DialogNames {
-    ADD_FRAGMENT = 'AddFragment',
-    ADD_TABLE_COLUMN_FRAGMENTS = 'AddTableColumnFragments',
-    CONTROLLER_EXTENSION = 'ControllerExtension',
-    ADD_FRAGMENT_AT_EXTENSION_POINT = 'ExtensionPoint'
-}
-
-type Controller = AddFragment | AddTableColumnFragments | ControllerExtension | ExtensionPoint;
+import { DialogFactory, DialogNames } from './dialog-factory';
 
 /**
  * Handler for enablement of Extend With Controller context menu entry
@@ -105,62 +87,6 @@ export const getAddFragmentItemText = (overlay: ElementOverlay) => {
     return 'Add: Fragment';
 };
 
-/**
- * Handler for new context menu entry
- *
- * @param overlay Control overlays
- * @param rta Runtime Authoring
- * @param dialogName Dialog name
- * @param extensionPointData Control ID
- * @param options Dialog options
- */
-export async function handler(
-    overlay: UI5Element,
-    rta: RuntimeAuthoring,
-    dialogName: DialogNames,
-    extensionPointData?: ExtensionPointData,
-    options: Partial<AddFragmentOptions> = {}
-): Promise<void> {
-    let controller: Controller;
-    const resources = await getTextBundle();
-
-    switch (dialogName) {
-        case DialogNames.ADD_FRAGMENT:
-            controller = new AddFragment(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
-                aggregation: options.aggregation,
-                title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
-            });
-            break;
-        case DialogNames.ADD_TABLE_COLUMN_FRAGMENTS:
-            controller = new AddTableColumnFragments(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, {
-                aggregation: options.aggregation,
-                title: resources.getText(options.title ?? 'ADP_ADD_FRAGMENT_DIALOG_TITLE')
-            });
-            break;
-        case DialogNames.CONTROLLER_EXTENSION:
-            controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta);
-            break;
-        case DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT:
-            controller = new ExtensionPoint(
-                `open.ux.preview.client.adp.controllers.${dialogName}`,
-                overlay,
-                rta,
-                extensionPointData!
-            );
-            break;
-    }
-
-    const id = dialogName === DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT ? `dialog--${dialogName}` : undefined;
-
-    const dialog = await Fragment.load({
-        name: `open.ux.preview.client.adp.ui.${dialogName}`,
-        controller,
-        id
-    });
-
-    await controller.setup(dialog as Dialog);
-}
-
 /**
  * Adds a new item to the context menu
  *
@@ -174,7 +100,8 @@ export const initDialogs = (rta: RuntimeAuthoring, syncViewsIds: string[], ui5Ve
     contextMenu.addMenuItem({
         id: 'ADD_FRAGMENT',
         text: getAddFragmentItemText,
-        handler: async (overlays: UI5Element[]) => await handler(overlays[0], rta, DialogNames.ADD_FRAGMENT),
+        handler: async (overlays: UI5Element[]) =>
+            await DialogFactory.createDialog(overlays[0], rta, DialogNames.ADD_FRAGMENT),
         icon: 'sap-icon://attachment-html',
         enabled: (overlays: ElementOverlay[]) => isFragmentCommandEnabled(overlays, ui5VersionInfo)
     });
@@ -182,7 +109,8 @@ export const initDialogs = (rta: RuntimeAuthoring, syncViewsIds: string[], ui5Ve
     contextMenu.addMenuItem({
         id: 'EXTEND_CONTROLLER',
         text: 'Extend With Controller',
-        handler: async (overlays: UI5Element[]) => await handler(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
+        handler: async (overlays: UI5Element[]) =>
+            await DialogFactory.createDialog(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
         icon: 'sap-icon://create-form',
         enabled: (overlays: ElementOverlay[]) => isControllerExtensionEnabled(overlays, syncViewsIds, ui5VersionInfo)
     });

package/dist/client/adp/quick-actions/common/add-controller-to-page.js

@@ -1,17 +1,18 @@
 "use strict";
 
-sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/version", "../../utils", "../../../cpe/quick-actions/utils", "../../init-dialogs", "../../api-handler", "../simple-quick-action-base"], function (OverlayRegistry, _____utils_version, ____utils, _____cpe_quick_actions_utils, ____init_dialogs, ____api_handler, ___simple_quick_action_base) {
+sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/version", "../../utils", "../../../cpe/quick-actions/utils", "../../dialog-factory", "../../init-dialogs", "../../api-handler", "../simple-quick-action-base", "../dialog-enablement-validator"], function (OverlayRegistry, _____utils_version, ____utils, _____cpe_quick_actions_utils, ____dialog_factory, ____init_dialogs, ____api_handler, ___simple_quick_action_base, ___dialog_enablement_validator) {
   "use strict";
 
   const getUi5Version = _____utils_version["getUi5Version"];
   const getAllSyncViewsIds = ____utils["getAllSyncViewsIds"];
   const getControllerInfoForControl = ____utils["getControllerInfoForControl"];
   const getRelevantControlFromActivePage = _____cpe_quick_actions_utils["getRelevantControlFromActivePage"];
-  const DialogNames = ____init_dialogs["DialogNames"];
-  const handler = ____init_dialogs["handler"];
+  const DialogFactory = ____dialog_factory["DialogFactory"];
+  const DialogNames = ____dialog_factory["DialogNames"];
   const isControllerExtensionEnabledForControl = ____init_dialogs["isControllerExtensionEnabledForControl"];
   const getExistingController = ____api_handler["getExistingController"];
   const SimpleQuickActionDefinitionBase = ___simple_quick_action_base["SimpleQuickActionDefinitionBase"];
+  const DIALOG_ENABLEMENT_VALIDATOR = ___dialog_enablement_validator["DIALOG_ENABLEMENT_VALIDATOR"];
   const ADD_CONTROLLER_TO_PAGE_TYPE = 'add-controller-to-page';
   const CONTROL_TYPES = ['sap.f.DynamicPage', 'sap.uxap.ObjectPageLayout'];
 
@@ -20,7 +21,7 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/version", "../../uti
    */
   class AddControllerToPageQuickAction extends SimpleQuickActionDefinitionBase {
     constructor(context) {
-      super(ADD_CONTROLLER_TO_PAGE_TYPE, CONTROL_TYPES, '', context);
+      super(ADD_CONTROLLER_TO_PAGE_TYPE, CONTROL_TYPES, '', context, [DIALOG_ENABLEMENT_VALIDATOR]);
     }
     controllerExists = false;
     async initialize() {
@@ -41,7 +42,7 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/version", "../../uti
     async execute() {
       if (this.control) {
         const overlay = OverlayRegistry.getOverlay(this.control) || [];
-        await handler(overlay, this.context.rta, DialogNames.CONTROLLER_EXTENSION);
+        await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.CONTROLLER_EXTENSION);
       }
       return [];
     }

package/dist/client/adp/quick-actions/common/add-controller-to-page.ts

@@ -8,9 +8,11 @@ import type {
     QuickActionContext,
     SimpleQuickActionDefinition
 } from '../../../cpe/quick-actions/quick-action-definition';
-import { DialogNames, handler, isControllerExtensionEnabledForControl } from '../../init-dialogs';
+import { DialogFactory, DialogNames } from '../../dialog-factory';
+import { isControllerExtensionEnabledForControl } from '../../init-dialogs';
 import { getExistingController } from '../../api-handler';
 import { SimpleQuickActionDefinitionBase } from '../simple-quick-action-base';
+import { DIALOG_ENABLEMENT_VALIDATOR } from '../dialog-enablement-validator';
 
 export const ADD_CONTROLLER_TO_PAGE_TYPE = 'add-controller-to-page';
 const CONTROL_TYPES = ['sap.f.DynamicPage', 'sap.uxap.ObjectPageLayout'];
@@ -23,7 +25,7 @@ export class AddControllerToPageQuickAction
     implements SimpleQuickActionDefinition
 {
     constructor(context: QuickActionContext) {
-        super(ADD_CONTROLLER_TO_PAGE_TYPE, CONTROL_TYPES, '', context);
+        super(ADD_CONTROLLER_TO_PAGE_TYPE, CONTROL_TYPES, '', context, [DIALOG_ENABLEMENT_VALIDATOR]);
     }
 
     private controllerExists = false;
@@ -52,7 +54,7 @@ export class AddControllerToPageQuickAction
     async execute(): Promise<FlexCommand[]> {
         if (this.control) {
             const overlay = OverlayRegistry.getOverlay(this.control) || [];
-            await handler(overlay, this.context.rta, DialogNames.CONTROLLER_EXTENSION);
+            await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.CONTROLLER_EXTENSION);
         }
         return [];
     }