@sap-ux/preview-middleware 0.20.1 → 0.20.2

package/dist/client/adp/extend-controller.js

@@ -0,0 +1,48 @@
+"use strict";
+
+sap.ui.define(["sap/ui/rta/command/CommandFactory", "./utils", "./dialog-factory", "sap/ui/rta/plugin/ExtendControllerPlugin"], function (CommandFactory, ___utils, ___dialog_factory, ExtendController) {
+  "use strict";
+
+  const createDeferred = ___utils["createDeferred"];
+  const DialogFactory = ___dialog_factory["DialogFactory"];
+  const DialogNames = ___dialog_factory["DialogNames"];
+  /**
+   * Initializes the ExtendControllerPlugin and includes it in the Runtime Authoring (RTA) plugins.
+   *
+   * @param rta Runtime Authoring instance
+   */
+  function initExtendControllerPlugin(rta) {
+    const flexSettings = rta.getFlexSettings();
+    const commandFactory = new CommandFactory({
+      flexSettings
+    });
+    const plugin = new ExtendController({
+      commandFactory,
+      handlerFunction: async overlay => await handlerFunction(rta, overlay)
+    });
+    const plugins = rta.getPlugins();
+    plugins.extendControllerPlugin = plugin;
+    rta.setPlugins(plugins);
+  }
+
+  /**
+   * Handles the creation of a controller extension by opening a dialog and resolving the deferred data.
+   *
+   * @param rta Runtime Authoring instance
+   * @param overlay UI5 Element overlay
+   * @returns A promise that resolves with DeferredXmlFragmentData
+   */
+  async function handlerFunction(rta, overlay) {
+    const deferred = createDeferred();
+    await DialogFactory.createDialog(overlay, rta, DialogNames.CONTROLLER_EXTENSION, {
+      deferred
+    });
+    return deferred.promise;
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.initExtendControllerPlugin = initExtendControllerPlugin;
+  return __exports;
+});
+//# sourceMappingURL=extend-controller.js.map

package/dist/client/adp/extend-controller.ts

@@ -0,0 +1,49 @@
+import type RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
+import type UI5Element from 'sap/ui/core/Element';
+import CommandFactory from 'sap/ui/rta/command/CommandFactory';
+import { Deferred, createDeferred } from './utils';
+import { DialogFactory, DialogNames } from './dialog-factory';
+import ExtendController from 'sap/ui/rta/plugin/ExtendControllerPlugin';
+
+export interface ExtendControllerData {
+    deferred: Deferred<DeferredExtendControllerData>;
+}
+
+export type DeferredExtendControllerData = {
+    codeRef: string;
+    viewId: string;
+};
+
+/**
+ * Initializes the ExtendControllerPlugin and includes it in the Runtime Authoring (RTA) plugins.
+ *
+ * @param rta Runtime Authoring instance
+ */
+export function initExtendControllerPlugin(rta: RuntimeAuthoring): void {
+    const flexSettings = rta.getFlexSettings();
+    const commandFactory = new CommandFactory({ flexSettings });
+
+    const plugin = new ExtendController({
+        commandFactory,
+        handlerFunction: async (overlay: UI5Element) => await handlerFunction(rta, overlay)
+    });
+
+    const plugins = rta.getPlugins();
+    plugins.extendControllerPlugin = plugin;
+    rta.setPlugins(plugins);
+}
+
+/**
+ * Handles the creation of a controller extension by opening a dialog and resolving the deferred data.
+ *
+ * @param rta Runtime Authoring instance
+ * @param overlay UI5 Element overlay
+ * @returns A promise that resolves with DeferredXmlFragmentData
+ */
+async function handlerFunction(rta: RuntimeAuthoring, overlay: UI5Element): Promise<DeferredExtendControllerData> {
+    const deferred = createDeferred<DeferredExtendControllerData>();
+
+    await DialogFactory.createDialog(overlay, rta, DialogNames.CONTROLLER_EXTENSION, { deferred });
+
+    return deferred.promise;
+}

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

@@ -1,30 +1,12 @@
 "use strict";
 
-sap.ui.define(["sap/ui/rta/util/hasStableId", "sap/ui/fl/Utils", "./dialog-factory", "../i18n", "./utils", "../utils/version"], function (hasStableId, FlUtils, ___dialog_factory, ___i18n, ___utils, ___utils_version) {
+sap.ui.define(["sap/ui/rta/util/hasStableId", "sap/ui/fl/Utils", "./dialog-factory", "../i18n", "./utils"], function (hasStableId, FlUtils, ___dialog_factory, ___i18n, ___utils) {
   "use strict";
 
-  function __ui5_require_async(path) {
-    return new Promise(function (resolve, reject) {
-      sap.ui.require([path], function (module) {
-        if (!(module && module.__esModule)) {
-          module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? {
-            default: module
-          } : module;
-          Object.defineProperty(module, "__esModule", {
-            value: true
-          });
-        }
-        resolve(module);
-      }, function (err) {
-        reject(err);
-      });
-    });
-  }
   const DialogFactory = ___dialog_factory["DialogFactory"];
   const DialogNames = ___dialog_factory["DialogNames"];
   const getTextBundle = ___i18n["getTextBundle"];
   const getReuseComponentChecker = ___utils["getReuseComponentChecker"];
-  const isLowerThanMinimalUi5Version = ___utils_version["isLowerThanMinimalUi5Version"];
   /**
    * Handler for enablement of Extend With Controller context menu entry
    *
@@ -105,12 +87,17 @@ sap.ui.define(["sap/ui/rta/util/hasStableId", "sap/ui/fl/Utils", "./dialog-facto
    * Determines the text that should be displayed for Controller Extension context menu item.
    *
    * @param {ElementOverlay} overlay - An ElementOverlay object representing the UI overlay.
+   * @param {string[]} syncViewsIds - Array of IDs of all application sync views.
    * @param {isReuseComponentApi} isReuseComponentChecker - Function to check if the control is a reuse component.
    * @param {boolean} isCloud - Whether the application is running in the cloud.
    * @param {TextBundle} resources - The text bundle.
    * @returns {string} The text of the Add Fragment context menu item.
    */
-  const getExtendControllerItemText = (overlay, isReuseComponentChecker, isCloud, resources) => {
+  const getExtendControllerItemText = (overlay, syncViewsIds, isReuseComponentChecker, isCloud, resources) => {
+    const viewId = FlUtils.getViewForControl(overlay.getElement()).getId();
+    if (syncViewsIds.includes(viewId)) {
+      return resources.getText('ADP_ADD_CONTROLLER_EXTENSION_MENU_ITEM_SYNC_VIEW');
+    }
     if (isCloud && isReuseComponentChecker(overlay.getElement().getId())) {
       return resources.getText('ADP_ADD_CONTROLLER_EXTENSION_MENU_ITEM_REUSE_COMPONENT');
     }
@@ -129,23 +116,16 @@ sap.ui.define(["sap/ui/rta/util/hasStableId", "sap/ui/fl/Utils", "./dialog-facto
     const isCloud = rta.getFlexSettings().isCloud;
     const resources = await getTextBundle();
     const isReuseComponentChecker = await getReuseComponentChecker(ui5VersionInfo);
-    if (isLowerThanMinimalUi5Version(ui5VersionInfo, {
-      major: 1,
-      minor: 136
-    })) {
-      contextMenu.addMenuItem({
-        id: 'ADD_FRAGMENT',
-        text: overlay => getAddFragmentItemText(overlay, isReuseComponentChecker, isCloud, resources),
-        handler: async overlays => await DialogFactory.createDialog(overlays[0], rta, DialogNames.ADD_FRAGMENT),
-        icon: 'sap-icon://attachment-html',
-        enabled: overlays => isFragmentCommandEnabled(overlays, isReuseComponentChecker, isCloud)
-      });
-    } else {
-      (await __ui5_require_async('open/ux/preview/client/adp/add-fragment')).initAddXMLPlugin(rta);
-    }
+    contextMenu.addMenuItem({
+      id: 'ADD_FRAGMENT',
+      text: overlay => getAddFragmentItemText(overlay, isReuseComponentChecker, isCloud, resources),
+      handler: async overlays => await DialogFactory.createDialog(overlays[0], rta, DialogNames.ADD_FRAGMENT),
+      icon: 'sap-icon://attachment-html',
+      enabled: overlays => isFragmentCommandEnabled(overlays, isReuseComponentChecker, isCloud)
+    });
     contextMenu.addMenuItem({
       id: 'EXTEND_CONTROLLER',
-      text: overlay => getExtendControllerItemText(overlay, isReuseComponentChecker, isCloud, resources),
+      text: overlay => getExtendControllerItemText(overlay, syncViewsIds, isReuseComponentChecker, isCloud, resources),
       handler: async overlays => await DialogFactory.createDialog(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
       icon: 'sap-icon://create-form',
       enabled: overlays => isControllerExtensionEnabled(overlays, syncViewsIds, isReuseComponentChecker, isCloud)

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

@@ -17,7 +17,6 @@ import type { IsReuseComponentApi } from '../cpe/types';
 import { getTextBundle, type TextBundle } from '../i18n';
 import { getReuseComponentChecker } from './utils';
 import type { Ui5VersionInfo } from '../utils/version';
-import { isLowerThanMinimalUi5Version } from '../utils/version';
 
 /**
  * Handler for enablement of Extend With Controller context menu entry
@@ -38,7 +37,7 @@ export function isControllerExtensionEnabledForControl(
     const viewId = FlUtils.getViewForControl(control).getId();
     const isControlInSyncView = syncViewsIds.includes(viewId);
 
-    if(isCloud) {
+    if (isCloud) {
         const isClickedControlReuseComponent = isReuseComponent(control.getId());
         return !isControlInSyncView && !isClickedControlReuseComponent;
     }
@@ -75,7 +74,11 @@ export const isControllerExtensionEnabled = (
  * @param {boolean} isCloud - Whether the application is running in the cloud.
  * @returns {boolean} True if the fragment command is enabled, false otherwise.
  */
-export const isFragmentCommandEnabled = (overlays: ElementOverlay[], isReuseComponent: IsReuseComponentApi, isCloud: boolean): boolean => {
+export const isFragmentCommandEnabled = (
+    overlays: ElementOverlay[],
+    isReuseComponent: IsReuseComponentApi,
+    isCloud: boolean
+): boolean => {
     if (overlays.length === 0 || overlays.length > 1) {
         return false;
     }
@@ -98,7 +101,12 @@ export const isFragmentCommandEnabled = (overlays: ElementOverlay[], isReuseComp
  * @param {TextBundle} resources - The text bundle.
  * @returns {string} The text of the Add Fragment context menu item.
  */
-export const getAddFragmentItemText = (overlay: ElementOverlay, isReuseComponentChecker: IsReuseComponentApi, isCloud: boolean, resources: TextBundle) => {
+export const getAddFragmentItemText = (
+    overlay: ElementOverlay,
+    isReuseComponentChecker: IsReuseComponentApi,
+    isCloud: boolean,
+    resources: TextBundle
+) => {
     if (isCloud && isReuseComponentChecker(overlay.getElement().getId())) {
         return resources.getText('ADP_ADD_FRAGMENT_MENU_ITEM_REUSE_COMPONENT');
     }
@@ -113,12 +121,24 @@ export const getAddFragmentItemText = (overlay: ElementOverlay, isReuseComponent
  * Determines the text that should be displayed for Controller Extension context menu item.
  *
  * @param {ElementOverlay} overlay - An ElementOverlay object representing the UI overlay.
+ * @param {string[]} syncViewsIds - Array of IDs of all application sync views.
  * @param {isReuseComponentApi} isReuseComponentChecker - Function to check if the control is a reuse component.
  * @param {boolean} isCloud - Whether the application is running in the cloud.
  * @param {TextBundle} resources - The text bundle.
  * @returns {string} The text of the Add Fragment context menu item.
  */
-export const getExtendControllerItemText = (overlay: ElementOverlay, isReuseComponentChecker: IsReuseComponentApi, isCloud: boolean, resources: TextBundle) => {
+export const getExtendControllerItemText = (
+    overlay: ElementOverlay,
+    syncViewsIds: string[],
+    isReuseComponentChecker: IsReuseComponentApi,
+    isCloud: boolean,
+    resources: TextBundle
+) => {
+    const viewId = FlUtils.getViewForControl(overlay.getElement()).getId();
+    if (syncViewsIds.includes(viewId)) {
+        return resources.getText('ADP_ADD_CONTROLLER_EXTENSION_MENU_ITEM_SYNC_VIEW');
+    }
+
     if (isCloud && isReuseComponentChecker(overlay.getElement().getId())) {
         return resources.getText('ADP_ADD_CONTROLLER_EXTENSION_MENU_ITEM_REUSE_COMPONENT');
     }
@@ -133,31 +153,33 @@ export const getExtendControllerItemText = (overlay: ElementOverlay, isReuseComp
  * @param syncViewsIds Ids of all application sync views
  * @param ui5VersionInfo UI5 version information
  */
-export const initDialogs = async (rta: RuntimeAuthoring, syncViewsIds: string[], ui5VersionInfo: Ui5VersionInfo): Promise<void> => {
+export const initDialogs = async (
+    rta: RuntimeAuthoring,
+    syncViewsIds: string[],
+    ui5VersionInfo: Ui5VersionInfo
+): Promise<void> => {
     const contextMenu = rta.getDefaultPlugins().contextMenu;
     const isCloud = rta.getFlexSettings().isCloud;
     const resources = await getTextBundle();
     const isReuseComponentChecker = await getReuseComponentChecker(ui5VersionInfo);
 
-    if (isLowerThanMinimalUi5Version(ui5VersionInfo, { major: 1, minor: 136 })) {
-        contextMenu.addMenuItem({
-            id: 'ADD_FRAGMENT',
-            text: (overlay: ElementOverlay) => getAddFragmentItemText(overlay, isReuseComponentChecker, isCloud, resources),
-            handler: async (overlays: UI5Element[]) =>
-                await DialogFactory.createDialog(overlays[0], rta, DialogNames.ADD_FRAGMENT),
-            icon: 'sap-icon://attachment-html',
-            enabled: (overlays: ElementOverlay[]) => isFragmentCommandEnabled(overlays, isReuseComponentChecker, isCloud)
-        });
-    } else {
-        (await import('open/ux/preview/client/adp/add-fragment')).initAddXMLPlugin(rta);
-    }
+    contextMenu.addMenuItem({
+        id: 'ADD_FRAGMENT',
+        text: (overlay: ElementOverlay) => getAddFragmentItemText(overlay, isReuseComponentChecker, isCloud, resources),
+        handler: async (overlays: UI5Element[]) =>
+            await DialogFactory.createDialog(overlays[0], rta, DialogNames.ADD_FRAGMENT),
+        icon: 'sap-icon://attachment-html',
+        enabled: (overlays: ElementOverlay[]) => isFragmentCommandEnabled(overlays, isReuseComponentChecker, isCloud)
+    });
 
     contextMenu.addMenuItem({
         id: 'EXTEND_CONTROLLER',
-        text: (overlay: ElementOverlay) => getExtendControllerItemText(overlay, isReuseComponentChecker, isCloud, resources),
+        text: (overlay: ElementOverlay) =>
+            getExtendControllerItemText(overlay, syncViewsIds, isReuseComponentChecker, isCloud, resources),
         handler: async (overlays: UI5Element[]) =>
             await DialogFactory.createDialog(overlays[0], rta, DialogNames.CONTROLLER_EXTENSION),
         icon: 'sap-icon://create-form',
-        enabled: (overlays: ElementOverlay[]) => isControllerExtensionEnabled(overlays, syncViewsIds, isReuseComponentChecker, isCloud)
+        enabled: (overlays: ElementOverlay[]) =>
+            isControllerExtensionEnabled(overlays, syncViewsIds, isReuseComponentChecker, isCloud)
     });
 };

package/dist/client/adp/init.js

@@ -49,7 +49,15 @@ sap.ui.define([
         const syncViewsIds = await getAllSyncViewsIds(ui5VersionInfo);
         const defaultPlugins = rta.getDefaultPlugins();
         rta.setPlugins(defaultPlugins);
-        await initDialogs(rta, syncViewsIds, ui5VersionInfo);
+        if (isLowerThanMinimalUi5Version(ui5VersionInfo, {
+                major: 1,
+                minor: 136
+            })) {
+            await initDialogs(rta, syncViewsIds, ui5VersionInfo);
+        } else {
+            (await __ui5_require_async('open/ux/preview/client/adp/add-fragment')).initAddXMLPlugin(rta);
+            (await __ui5_require_async('open/ux/preview/client/adp/extend-controller')).initExtendControllerPlugin(rta);
+        }
         if (!isLowerThanMinimalUi5Version(ui5VersionInfo, {
                 major: 1,
                 minor: 78

package/dist/client/adp/init.ts

@@ -28,7 +28,12 @@ export default async function (rta: RuntimeAuthoring) {
     const defaultPlugins = rta.getDefaultPlugins();
     rta.setPlugins(defaultPlugins);
 
-    await initDialogs(rta, syncViewsIds, ui5VersionInfo);
+    if (isLowerThanMinimalUi5Version(ui5VersionInfo, { major: 1, minor: 136 })) {
+        await initDialogs(rta, syncViewsIds, ui5VersionInfo);
+    } else {
+        (await import('open/ux/preview/client/adp/add-fragment')).initAddXMLPlugin(rta);
+        (await import('open/ux/preview/client/adp/extend-controller')).initExtendControllerPlugin(rta);
+    }
 
     if (!isLowerThanMinimalUi5Version(ui5VersionInfo, { major: 1, minor: 78 })) {
         const ExtensionPointService = (await import('open/ux/preview/client/adp/extension-point')).default;

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

@@ -1,12 +1,13 @@
 "use strict";
 
-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) {
+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", "../../../i18n"], function (OverlayRegistry, _____utils_version, ____utils, _____cpe_quick_actions_utils, ____dialog_factory, ____init_dialogs, ____api_handler, ___simple_quick_action_base, ___dialog_enablement_validator, _____i18n) {
   "use strict";
 
   const getUi5Version = _____utils_version["getUi5Version"];
   const getAllSyncViewsIds = ____utils["getAllSyncViewsIds"];
   const getControllerInfoForControl = ____utils["getControllerInfoForControl"];
   const getReuseComponentChecker = ____utils["getReuseComponentChecker"];
+  const checkForExistingChange = ____utils["checkForExistingChange"];
   const getRelevantControlFromActivePage = _____cpe_quick_actions_utils["getRelevantControlFromActivePage"];
   const DialogFactory = ____dialog_factory["DialogFactory"];
   const DialogNames = ____dialog_factory["DialogNames"];
@@ -14,6 +15,7 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/version", "../../uti
   const getExistingController = ____api_handler["getExistingController"];
   const SimpleQuickActionDefinitionBase = ___simple_quick_action_base["SimpleQuickActionDefinitionBase"];
   const DIALOG_ENABLEMENT_VALIDATOR = ___dialog_enablement_validator["DIALOG_ENABLEMENT_VALIDATOR"];
+  const getTextBundle = _____i18n["getTextBundle"];
   const ADD_CONTROLLER_TO_PAGE_TYPE = 'add-controller-to-page';
   const CONTROL_TYPES = ['sap.f.DynamicPage', 'sap.uxap.ObjectPageLayout'];
 
@@ -22,9 +24,21 @@ 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, [DIALOG_ENABLEMENT_VALIDATOR]);
+      super(ADD_CONTROLLER_TO_PAGE_TYPE, CONTROL_TYPES, '', context, [DIALOG_ENABLEMENT_VALIDATOR, {
+        run: async () => {
+          const controllerName = getControllerInfoForControl(this.context.view).controllerName;
+          const i18n = await getTextBundle();
+          if (checkForExistingChange(this.context.rta, 'codeExt', 'selector.controllerName', controllerName)) {
+            return {
+              type: 'error',
+              message: i18n.getText('ADP_QUICK_ACTION_CONTROLLER_PENDING_CHANGE_EXISTS')
+            };
+          }
+        }
+      }]);
     }
     controllerExists = false;
+    forceRefreshAfterExecution = true;
     async initialize() {
       const version = await getUi5Version();
       const isReuseComponent = await getReuseComponentChecker(version);

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

@@ -2,7 +2,7 @@ import OverlayRegistry from 'sap/ui/dt/OverlayRegistry';
 import FlexCommand from 'sap/ui/rta/command/FlexCommand';
 
 import { getUi5Version } from '../../../utils/version';
-import { getAllSyncViewsIds, getControllerInfoForControl, getReuseComponentChecker } from '../../utils';
+import { getAllSyncViewsIds, getControllerInfoForControl, getReuseComponentChecker, checkForExistingChange } from '../../utils';
 import { getRelevantControlFromActivePage } from '../../../cpe/quick-actions/utils';
 import type {
     QuickActionContext,
@@ -13,6 +13,8 @@ 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';
+import type { EnablementValidatorResult } from '../enablement-validator';
+import { getTextBundle } from '../../../i18n';
 
 export const ADD_CONTROLLER_TO_PAGE_TYPE = 'add-controller-to-page';
 const CONTROL_TYPES = ['sap.f.DynamicPage', 'sap.uxap.ObjectPageLayout'];
@@ -25,10 +27,25 @@ export class AddControllerToPageQuickAction
     implements SimpleQuickActionDefinition
 {
     constructor(context: QuickActionContext) {
-        super(ADD_CONTROLLER_TO_PAGE_TYPE, CONTROL_TYPES, '', context, [DIALOG_ENABLEMENT_VALIDATOR]);
+        super(ADD_CONTROLLER_TO_PAGE_TYPE, CONTROL_TYPES, '', context, [
+            DIALOG_ENABLEMENT_VALIDATOR,
+            {
+                run: async (): Promise<EnablementValidatorResult> => {
+                    const controllerName = getControllerInfoForControl(this.context.view).controllerName;
+                    const i18n = await getTextBundle();
+                    if (checkForExistingChange(this.context.rta, 'codeExt', 'selector.controllerName', controllerName)) {
+                        return {
+                            type: 'error',
+                            message: i18n.getText('ADP_QUICK_ACTION_CONTROLLER_PENDING_CHANGE_EXISTS')
+                        };
+                    }
+                }
+            }
+        ]);
     }
 
     private controllerExists = false;
+    forceRefreshAfterExecution = true;
 
     async initialize(): Promise<void> {
         const version = await getUi5Version();
@@ -43,7 +60,12 @@ export class AddControllerToPageQuickAction
             const controlInfo = getControllerInfoForControl(control);
             const data = await getExistingController(controlInfo.controllerName);
             this.controllerExists = data?.controllerExists;
-            const isActiveAction = isControllerExtensionEnabledForControl(control, syncViewsIds, isReuseComponent, this.context.flexSettings.isCloud);
+            const isActiveAction = isControllerExtensionEnabledForControl(
+                control,
+                syncViewsIds,
+                isReuseComponent,
+                this.context.flexSettings.isCloud
+            );
             this.control = isActiveAction ? control : undefined;
             break;
         }

package/dist/client/adp/ui/ControllerExtension.fragment.xml

@@ -11,7 +11,8 @@
             editable="true"
             layout="ResponsiveGridLayout"
             labelSpanS="4"
-            singleContainerFullSize="false">
+            singleContainerFullSize="false"
+            visible="{/inputFormVisibility}">
             <f:content>
                 <Label text="Controller Name" />
                 <Input 
@@ -26,13 +27,23 @@
             editable="true"
             layout="ResponsiveGridLayout"
             labelSpanS="12"
-            visible="false"
+            visible="{/existingControllerFormVisibility}"
             singleContainerFullSize="false">
             <f:content>
-                <Label text="An existing controller extension has been found. Please use the previously created extension controller" />
+                <Label text="{i18n>ADP_CONTROLLER_EXTENSION_EXISTS}" />
                 <Text text="{/controllerPathFromRoot}" />
             </f:content>
         </f:SimpleForm>
+        <f:SimpleForm
+            editable="true"
+            layout="ResponsiveGridLayout"
+            labelSpanS="12"
+            visible="{/pendingChangeFormVisibility}"
+            singleContainerFullSize="false">
+            <f:content>
+                <Text text="{i18n>ADP_CONTROLLER_PENDING_CHANGE_EXISTS}" />
+            </f:content>
+        </f:SimpleForm>
     </content>
     <beginButton>
         <Button 

package/dist/client/adp/utils.js

@@ -57,19 +57,58 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/Element", "sap/base/Log", "sap
   }
 
   /**
-   * Checks if the fragment name associated with a command matches the specified fragment name.
+   * Checks for the existence of a change associated with a specific fragment name in the RTA command stack.
+   *
+   * @param {RuntimeAuthoring} rta - The RuntimeAuthoring instance to check for existing changes.
+   * @param {string} commandName - The name of the fragment to check for existing changes.
+   * @param {string} propertyPath - The path to the property as string separated by dot in the change definition to check.
+   * @param {string} propertyValue - The value to match against the specified property.
+   * @returns {Promise<boolean>} A promise that resolves to `true` if a matching change is found, otherwise `false`.
+   */
+  function checkForExistingChange(rta, commandName, propertyPath, propertyValue) {
+    const allCommands = rta.getCommandStack().getCommands();
+    return allCommands.some(command => {
+      if (typeof command.getCommands === 'function') {
+        const subCommand = command.getCommands().find(c => c?.getProperty('name') === commandName);
+        return subCommand && matchesChangeProperty(subCommand, propertyPath, propertyValue);
+      } else {
+        return matchesChangeProperty(command, propertyPath, propertyValue);
+      }
+    });
+  }
+
+  /**
+   * Retrieves the value of a nested property from an object based on a dot-separated path.
+   *
+   * @param obj - The object from which to retrieve the nested property.
+   * @param path - A dot-separated string representing the path to the desired property.
+   *               For example, "a.b.c" will attempt to access `obj.a.b.c`.
+   * @returns The value of the nested property if it exists, or `undefined` if any part of the path is invalid.
+   */
+  function getNestedProperty(obj, path) {
+    return path.split('.').reduce((acc, key) => {
+      return acc?.[key];
+    }, obj);
+  }
+
+  /**
+   * Checks if a specific property in the command's change matches the given value.
    *
    * @param {FlexCommand} command - The command object containing the prepared change to be examined.
-   * @param {string} fragmentName - The name of the fragment to match against the command's change.
-   * @returns {boolean} Returns true if the command's change contains a fragment path that matches
-   *                    the specified fragment name; otherwise, returns false.
+   * @param {string} propertyPath - The path to the property in the change definition to check.
+   * @param {string} propertyValue - The value to match against the specified property.
+   * @returns {boolean} Returns true if the command's change contains the specified property with the matching value; otherwise, returns false.
    */
-  function matchesFragmentName(command, fragmentName) {
+  function matchesChangeProperty(command, propertyPath, propertyValue) {
     if (typeof command.getPreparedChange !== 'function') {
       return false;
     }
-    const change = command.getPreparedChange().getDefinition();
-    return change.content?.fragmentPath?.includes(`${fragmentName}.fragment.xml`) || false;
+    const change = command.getPreparedChange()?.getDefinition?.();
+    if (!change) {
+      return false;
+    }
+    const nestedProperty = getNestedProperty(change, propertyPath);
+    return typeof nestedProperty === 'string' ? nestedProperty.includes(propertyValue) : false;
   }
 
   /**
@@ -209,7 +248,9 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/Element", "sap/base/Log", "sap
   };
   __exports.resetReuseComponentChecker = resetReuseComponentChecker;
   __exports.createDeferred = createDeferred;
-  __exports.matchesFragmentName = matchesFragmentName;
+  __exports.checkForExistingChange = checkForExistingChange;
+  __exports.getNestedProperty = getNestedProperty;
+  __exports.matchesChangeProperty = matchesChangeProperty;
   __exports.notifyUser = notifyUser;
   __exports.getAllSyncViewsIds = getAllSyncViewsIds;
   __exports.getControllerInfoForControl = getControllerInfoForControl;

package/dist/client/adp/utils.ts

@@ -9,6 +9,7 @@ import FlexUtils from 'sap/ui/fl/Utils';
 import IsReuseComponentApi from 'sap/ui/rta/util/isReuseComponent';
 import { getControlById } from '../utils/core';
 import type { Manifest } from 'sap/ui/rta/RuntimeAuthoring';
+import RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
 
 import { getError } from '../utils/error';
 import { isLowerThanMinimalUi5Version, Ui5VersionInfo } from '../utils/version';
@@ -60,19 +61,66 @@ export function createDeferred<T>(): Deferred<T> {
 }
 
 /**
- * Checks if the fragment name associated with a command matches the specified fragment name.
+ * Checks for the existence of a change associated with a specific fragment name in the RTA command stack.
+ *
+ * @param {RuntimeAuthoring} rta - The RuntimeAuthoring instance to check for existing changes.
+ * @param {string} commandName - The name of the fragment to check for existing changes.
+ * @param {string} propertyPath - The path to the property as string separated by dot in the change definition to check.
+ * @param {string} propertyValue - The value to match against the specified property.
+ * @returns {Promise<boolean>} A promise that resolves to `true` if a matching change is found, otherwise `false`.
+ */
+export function checkForExistingChange(
+    rta: RuntimeAuthoring,
+    commandName: string,
+    propertyPath: string,
+    propertyValue: string
+): boolean {
+    const allCommands = rta.getCommandStack().getCommands();
+
+    return allCommands.some((command: FlexCommand) => {
+        if (typeof command.getCommands === 'function') {
+            const subCommand = command.getCommands().find((c: FlexCommand) => c?.getProperty('name') === commandName);
+
+            return subCommand && matchesChangeProperty(subCommand, propertyPath, propertyValue);
+        } else {
+            return matchesChangeProperty(command, propertyPath, propertyValue);
+        }
+    });
+}
+
+/**
+ * Retrieves the value of a nested property from an object based on a dot-separated path.
+ *
+ * @param obj - The object from which to retrieve the nested property.
+ * @param path - A dot-separated string representing the path to the desired property.
+ *               For example, "a.b.c" will attempt to access `obj.a.b.c`.
+ * @returns The value of the nested property if it exists, or `undefined` if any part of the path is invalid.
+ */
+export function getNestedProperty(obj: object, path: string): unknown {
+    return path.split('.').reduce((acc: unknown, key) => {
+        return (acc as Record<string, unknown>)?.[key];
+    }, obj);
+}
+
+/**
+ * Checks if a specific property in the command's change matches the given value.
  *
  * @param {FlexCommand} command - The command object containing the prepared change to be examined.
- * @param {string} fragmentName - The name of the fragment to match against the command's change.
- * @returns {boolean} Returns true if the command's change contains a fragment path that matches
- *                    the specified fragment name; otherwise, returns false.
+ * @param {string} propertyPath - The path to the property in the change definition to check.
+ * @param {string} propertyValue - The value to match against the specified property.
+ * @returns {boolean} Returns true if the command's change contains the specified property with the matching value; otherwise, returns false.
  */
-export function matchesFragmentName(command: FlexCommand, fragmentName: string): boolean {
+export function matchesChangeProperty(command: FlexCommand, propertyPath: string, propertyValue: string): boolean {
     if (typeof command.getPreparedChange !== 'function') {
         return false;
     }
-    const change = command.getPreparedChange().getDefinition() as unknown as FragmentChange;
-    return change.content?.fragmentPath?.includes(`${fragmentName}.fragment.xml`) || false;
+    const change = command.getPreparedChange()?.getDefinition?.();
+    if (!change) {
+        return false;
+    }
+
+    const nestedProperty = getNestedProperty(change, propertyPath);
+    return typeof nestedProperty === 'string' ? nestedProperty.includes(propertyValue) : false;
 }
 
 /**

package/dist/client/cpe/connector-service.ts

@@ -45,6 +45,7 @@ export class WorkspaceConnectorService {
             changeType?: string;
             content?: {
                 fragmentPath?: string;
+                codeRef?: string;
             };
         };
         if (