@sap-ux/preview-middleware 0.20.1 → 0.20.3

package/dist/client/adp/command-executor.js

@@ -22,10 +22,10 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/rta/command/CommandFactory", "../ut
      * @param runtimeControl Managed object
      * @param commandName Command name
      * @param modifiedValue Modified value/s
-     * @param designMetadata Design time metadata
      * @param flexSettings Additional flex settings
+     * @param designMetadata Design time metadata
      */
-    async getCommand(runtimeControl, commandName, modifiedValue, designMetadata, flexSettings) {
+    async getCommand(runtimeControl, commandName, modifiedValue, flexSettings, designMetadata) {
       try {
         return await CommandFactory.getCommandFor(runtimeControl, commandName, modifiedValue, designMetadata, flexSettings);
       } catch (e) {

package/dist/client/adp/command-executor.ts

@@ -8,7 +8,7 @@ import type DesignTimeMetadata from 'sap/ui/dt/DesignTimeMetadata';
 import type FlexCommand from 'sap/ui/rta/command/FlexCommand';
 import { getError } from '../utils/error';
 
-type CommandNames = 'addXML';
+type CommandNames = 'addXML' | 'codeExt';
 
 /**
  * Class responsible for handling rta calls
@@ -26,15 +26,15 @@ export default class CommandExecutor {
      * @param runtimeControl Managed object
      * @param commandName Command name
      * @param modifiedValue Modified value/s
-     * @param designMetadata Design time metadata
      * @param flexSettings Additional flex settings
+     * @param designMetadata Design time metadata
      */
     public async getCommand<T>(
         runtimeControl: ManagedObject,
         commandName: CommandNames,
         modifiedValue: object,
-        designMetadata: DesignTimeMetadata,
-        flexSettings: FlexSettings
+        flexSettings: FlexSettings,
+        designMetadata?: DesignTimeMetadata
     ): Promise<FlexCommand<T>> {
         try {
             return await CommandFactory.getCommandFor(

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

@@ -143,7 +143,7 @@ sap.ui.define([
             const flexSettings = this.rta.getFlexSettings();
             const overlay = OverlayRegistry.getOverlay(this.runtimeControl);
             const designMetadata = overlay.getDesignTimeMetadata();
-            const command = await this.commandExecutor.getCommand(this.runtimeControl, 'addXML', modifiedValue, designMetadata, flexSettings);
+            const command = await this.commandExecutor.getCommand(this.runtimeControl, 'addXML', modifiedValue, flexSettings, designMetadata);
             await this.commandExecutor.pushAndExecuteCommand(command);
         }
     });

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

@@ -243,8 +243,8 @@ export default class AddFragment extends BaseDialog<AddFragmentModel> {
             this.runtimeControl,
             'addXML',
             modifiedValue,
-            designMetadata,
-            flexSettings
+            flexSettings,
+            designMetadata
         );
 
         await this.commandExecutor.pushAndExecuteCommand(command);

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

@@ -160,7 +160,7 @@ sap.ui.define([
                     targetAggregation: fragment.targetAggregation === ITEMS_AGGREGATION ? CELLS_AGGREGATION : fragment.targetAggregation
                 };
                 const targetObject = fragment.targetAggregation === COLUMNS_AGGREGATION ? this.runtimeControl : this.runtimeControl.getAggregation(ITEMS_AGGREGATION)[0];
-                const command = await this.commandExecutor.getCommand(targetObject, 'addXML', modifiedValue, designMetadata, flexSettings);
+                const command = await this.commandExecutor.getCommand(targetObject, 'addXML', modifiedValue, flexSettings, designMetadata);
                 const templateName = fragment.targetAggregation === COLUMNS_AGGREGATION ? `V2_SMART_TABLE_COLUMN` : 'V2_SMART_TABLE_CELL';
                 const preparedChange = command.getPreparedChange();
                 setAdditionalChangeInfoForChangeFile(preparedChange.getDefinition().fileName, { templateName });

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

@@ -283,8 +283,8 @@ export default class AddTableColumnFragments extends BaseDialog<AddTableColumnsF
                 targetObject,
                 'addXML',
                 modifiedValue,
-                designMetadata,
-                flexSettings
+                flexSettings,
+                designMetadata
             );
 
             const templateName =

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

@@ -16,7 +16,7 @@ sap.ui.define([
         return obj && obj.__esModule && typeof obj.default !== 'undefined' ? obj.default : obj;
     }
     const ValueState = sap_ui_core_library['ValueState'];
-    const matchesFragmentName = ___utils['matchesFragmentName'];
+    const checkForExistingChange = ___utils['checkForExistingChange'];
     const getError = ____utils_error['getError'];
     const getControlById = ____utils_core['getControlById'];
     const ControlUtils = _interopRequireDefault(__ControlUtils);
@@ -118,7 +118,7 @@ sap.ui.define([
                 updateDialogState(ValueState.Error, 'A fragment file name cannot contain more than 64 characters.');
                 return;
             }
-            const changeExists = this.checkForExistingChange(fragmentName);
+            const changeExists = checkForExistingChange(this.rta, 'addXMLAtExtensionPoint', 'content.fragmentPath', `${ fragmentName }.fragment.xml`);
             if (changeExists) {
                 updateDialogState(ValueState.Error, 'Enter a different name. The fragment name entered matches the name of an unsaved fragment.');
                 return;
@@ -126,17 +126,6 @@ sap.ui.define([
             updateDialogState(ValueState.Success);
             this.model.setProperty('/newFragmentName', fragmentName);
         },
-        checkForExistingChange: function _checkForExistingChange(fragmentName) {
-            const allCommands = this.rta.getCommandStack().getCommands();
-            return allCommands.some(command => {
-                if (typeof command.getCommands === 'function') {
-                    const addXmlCommand = command.getCommands().find(c => c?.getProperty('name') === 'addXMLAtExtensionPoint');
-                    return addXmlCommand && matchesFragmentName(addXmlCommand, fragmentName);
-                } else {
-                    return matchesFragmentName(command, fragmentName);
-                }
-            });
-        },
         setEscapeHandler: function _setEscapeHandler() {
             this.dialog.setEscapeHandler(_ref => {
                 let {resolve} = _ref;

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

@@ -7,10 +7,9 @@ import { ValueState } from 'sap/ui/core/library';
 import Controller from 'sap/ui/core/mvc/Controller';
 import JSONModel from 'sap/ui/model/json/JSONModel';
 import RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
-import FlexCommand from 'sap/ui/rta/command/FlexCommand';
 import MessageToast from 'sap/m/MessageToast';
 import CommandExecutor from '../command-executor';
-import { matchesFragmentName } from '../utils';
+import { checkForExistingChange } from '../utils';
 import type { Fragments } from '../api-handler';
 import { getError } from '../../utils/error';
 import ManagedObjectMetadata from 'sap/ui/base/ManagedObjectMetadata';
@@ -168,7 +167,12 @@ export default abstract class BaseDialog<T extends BaseDialogModel = BaseDialogM
             return;
         }
 
-        const changeExists = this.checkForExistingChange(fragmentName);
+        const changeExists = checkForExistingChange(
+            this.rta,
+            'addXMLAtExtensionPoint',
+            'content.fragmentPath',
+            `${fragmentName}.fragment.xml`
+        );
 
         if (changeExists) {
             updateDialogState(
@@ -182,28 +186,6 @@ export default abstract class BaseDialog<T extends BaseDialogModel = BaseDialogM
         this.model.setProperty('/newFragmentName', fragmentName);
     }
 
-    /**
-     * Checks for the existence of a change associated with a specific fragment name in the RTA command stack.
-     *
-     * @param {string} fragmentName - The name of the fragment to check for existing changes.
-     * @returns {Promise<boolean>} A promise that resolves to `true` if a matching change is found, otherwise `false`.
-     */
-    checkForExistingChange(fragmentName: string): boolean {
-        const allCommands = this.rta.getCommandStack().getCommands();
-
-        return allCommands.some((command: FlexCommand) => {
-            if (typeof command.getCommands === 'function') {
-                const addXmlCommand = command
-                    .getCommands()
-                    .find((c: FlexCommand) => c?.getProperty('name') === 'addXMLAtExtensionPoint');
-
-                return addXmlCommand && matchesFragmentName(addXmlCommand, fragmentName);
-            } else {
-                return matchesFragmentName(command, fragmentName);
-            }
-        });
-    }
-
     /**
      * Sets custom function that fires when user presses escape key.
      */

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

@@ -1,6 +1,6 @@
 "use strict";
 
-sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/JSONModel", "../api-handler", "./BaseDialog.controller", "../utils"], function (MessageToast, sap_ui_core_library, JSONModel, ___api_handler, __BaseDialog, ___utils) {
+sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/JSONModel", "../api-handler", "./BaseDialog.controller", "../../i18n", "../utils", "../../utils/version", "../command-executor", "../../utils/core"], function (MessageToast, sap_ui_core_library, JSONModel, ___api_handler, __BaseDialog, ____i18n, ___utils, ____utils_version, __CommandExecutor, ____utils_core) {
   "use strict";
 
   function _interopRequireDefault(obj) {
@@ -14,16 +14,25 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
   const writeChange = ___api_handler["writeChange"];
   const writeController = ___api_handler["writeController"];
   const BaseDialog = _interopRequireDefault(__BaseDialog);
+  const getResourceModel = ____i18n["getResourceModel"];
+  const getTextBundle = ____i18n["getTextBundle"];
+  const notifyUser = ___utils["notifyUser"];
+  const checkForExistingChange = ___utils["checkForExistingChange"];
   const getControllerInfo = ___utils["getControllerInfo"];
+  const getUi5Version = ____utils_version["getUi5Version"];
+  const isLowerThanMinimalUi5Version = ____utils_version["isLowerThanMinimalUi5Version"];
+  const CommandExecutor = _interopRequireDefault(__CommandExecutor);
+  const getControlById = ____utils_core["getControlById"];
   /**
    * @namespace open.ux.preview.client.adp.controllers
    */
   const ControllerExtension = BaseDialog.extend("open.ux.preview.client.adp.controllers.ControllerExtension", {
-    constructor: function _constructor(name, overlays, rta, telemetryData) {
+    constructor: function _constructor(name, overlays, rta, data, telemetryData) {
       BaseDialog.prototype.constructor.call(this, name, telemetryData);
       this.rta = rta;
       this.overlays = overlays;
       this.model = new JSONModel();
+      this.data = data;
     },
     /**
      * Setups the Dialog and the JSON Model
@@ -33,7 +42,10 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
     setup: async function _setup(dialog) {
       this.dialog = dialog;
       this.setEscapeHandler();
+      const resourceModel = await getResourceModel('open.ux.preview.client');
+      this.bundle = await getTextBundle();
       await this.buildDialogData();
+      this.dialog.setModel(resourceModel, 'i18n');
       this.dialog.setModel(this.model);
       this.dialog.open();
     },
@@ -58,10 +70,15 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
         return;
       }
       const fileExists = controllerList.some(f => f.controllerName === controllerName);
+      const pendingChangeExists = checkForExistingChange(this.rta, 'codeExt', 'content.codeRef', `${controllerName}.js`);
       if (fileExists) {
         updateDialogState(ValueState.Error, 'Enter a different name. The controller name that you entered already exists in your project.');
         return;
       }
+      if (pendingChangeExists) {
+        updateDialogState(ValueState.Error, 'Enter a different name. The controller name that you entered already exists as a pending change.');
+        return;
+      }
       const isValidName = /^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(controllerName);
       if (!isValidName) {
         updateDialogState(ValueState.Error, 'The controller name cannot contain white spaces or special characters.');
@@ -87,7 +104,15 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
         source.setEnabled(false);
         const controllerName = this.model.getProperty('/newControllerName');
         const viewId = this.model.getProperty('/viewId');
-        await this.createNewController(controllerName, viewId);
+        const controllerRef = {
+          codeRef: `coding/${controllerName}.js`,
+          viewId
+        };
+        if (this.data) {
+          this.data.deferred.resolve(controllerRef);
+        } else {
+          await this.createNewController(controllerName, controllerRef);
+        }
       } else {
         const controllerPath = this.model.getProperty('/controllerPath');
         window.open(`vscode://file${controllerPath}`);
@@ -105,8 +130,11 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
         viewId
       } = getControllerInfo(overlayControl);
       const data = await this.getExistingController(controllerName);
+      const hasPendingChangeForView = checkForExistingChange(this.rta, 'codeExt', 'selector.controllerName', controllerName);
       if (data) {
-        if (data?.controllerExists) {
+        if (hasPendingChangeForView) {
+          this.updateModelForExistingPendingChange();
+        } else if (data?.controllerExists) {
           this.updateModelForExistingController(data);
         } else {
           this.updateModelForNewController(viewId, data.isTsSupported);
@@ -129,11 +157,9 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
       this.model.setProperty('/controllerExists', controllerExists);
       this.model.setProperty('/controllerPath', controllerPath);
       this.model.setProperty('/controllerPathFromRoot', controllerPathFromRoot);
-      const content = this.dialog.getContent();
-      const form = content[0];
-      form.setVisible(false);
-      const messageForm = content[1];
-      messageForm.setVisible(true);
+      this.model.setProperty('/inputFormVisibility', false);
+      this.model.setProperty('/pendingChangeFormVisibility', false);
+      this.model.setProperty('/existingControllerFormVisibility', true);
       if (isRunningInBAS) {
         this.dialog.getBeginButton().setVisible(false);
       } else {
@@ -141,6 +167,16 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
       }
       this.dialog.getEndButton().setText('Close');
     },
+    /**
+     * Updates the model properties for an existing controller in a pending change.
+     */
+    updateModelForExistingPendingChange: function _updateModelForExistingPendingChange() {
+      this.model.setProperty('/inputFormVisibility', false);
+      this.model.setProperty('/existingControllerFormVisibility', false);
+      this.model.setProperty('/pendingChangeFormVisibility', true);
+      this.dialog.getBeginButton().setVisible(false);
+      this.dialog.getEndButton().setText('Close');
+    },
     /**
      * Updates the model property for a new controller.
      *
@@ -150,6 +186,9 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
     updateModelForNewController: function _updateModelForNewController(viewId, isTsSupported) {
       this.model.setProperty('/viewId', viewId);
       this.model.setProperty('/controllerExtension', isTsSupported ? '.ts' : '.js');
+      this.model.setProperty('/existingControllerFormVisibility', false);
+      this.model.setProperty('/pendingChangeFormVisibility', false);
+      this.model.setProperty('/inputFormVisibility', true);
     },
     /**
      * Retrieves existing controller data if found in the project's workspace.
@@ -183,17 +222,21 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
      * Creates a new fragment for the specified control
      *
      * @param controllerName Controller Name
-     * @param viewId View Id
+     * @param controllerRef Controller reference
      */
-    createNewController: async function _createNewController(controllerName, viewId) {
+    createNewController: async function _createNewController(controllerName, controllerRef) {
+      const ui5Version = await getUi5Version();
+      if (!isLowerThanMinimalUi5Version(ui5Version, {
+        major: 1,
+        minor: 135
+      })) {
+        await this.createControllerCommand(controllerName, controllerRef);
+        return;
+      }
       try {
         await writeController({
           controllerName
         });
-        const controllerRef = {
-          codeRef: `coding/${controllerName}.js`,
-          viewId
-        };
         const service = await this.rta.getService('controllerExtension');
         const change = await service.add(controllerRef.codeRef, controllerRef.viewId);
         change.creation = new Date().toISOString();
@@ -205,6 +248,21 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/core/library", "sap/ui/model/json/J
         await this.getControllers();
         this.handleError(e);
       }
+    },
+    /**
+     * Creates a controller command and executes it.
+     *
+     * @param controllerName Controller name
+     * @param controllerRef Controller reference
+     */
+    createControllerCommand: async function _createControllerCommand(controllerName, controllerRef) {
+      const flexSettings = this.rta.getFlexSettings();
+      const commandExecutor = new CommandExecutor(this.rta);
+      const view = getControlById(controllerRef.viewId);
+      const command = await commandExecutor.getCommand(view, 'codeExt', controllerRef, flexSettings);
+      await commandExecutor.pushAndExecuteCommand(command);
+      const bundle = await getTextBundle();
+      notifyUser(bundle.getText('ADP_CREATE_CONTROLLER_EXTENSION', [controllerName]), 8000);
     }
   });
   return ControllerExtension;

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

@@ -17,17 +17,19 @@ import JSONModel from 'sap/ui/model/json/JSONModel';
 /** sap.ui.rta */
 import type RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
 
-/** sap.ui.layout */
-import type SimpleForm from 'sap/ui/layout/form/SimpleForm';
-
 /** sap.ui.dt */
 import type ElementOverlay from 'sap/ui/dt/ElementOverlay';
 
 import type { CodeExtResponse, ControllersResponse } from '../api-handler';
 import { getExistingController, readControllers, writeChange, writeController } from '../api-handler';
 import BaseDialog from './BaseDialog.controller';
-import { getControllerInfo } from '../utils';
+import type { ExtendControllerData, DeferredExtendControllerData } from '../extend-controller';
 import { QuickActionTelemetryData } from '../../cpe/quick-actions/quick-action-definition';
+import { getResourceModel, getTextBundle, TextBundle } from '../../i18n';
+import { notifyUser, checkForExistingChange, getControllerInfo } from '../utils';
+import { getUi5Version, isLowerThanMinimalUi5Version } from '../../utils/version';
+import CommandExecutor from '../command-executor';
+import { getControlById } from '../../utils/core';
 
 interface ControllerExtensionService {
     add: (codeRef: string, viewId: string) => Promise<{ creation: string }>;
@@ -53,11 +55,21 @@ type ControllerModel = JSONModel & {
  * @namespace open.ux.preview.client.adp.controllers
  */
 export default class ControllerExtension extends BaseDialog<ControllerModel> {
-    constructor(name: string, overlays: UI5Element, rta: RuntimeAuthoring, telemetryData?: QuickActionTelemetryData) {
+    public readonly data?: ExtendControllerData;
+    private bundle: TextBundle;
+
+    constructor(
+        name: string,
+        overlays: UI5Element,
+        rta: RuntimeAuthoring,
+        data?: ExtendControllerData,
+        telemetryData?: QuickActionTelemetryData
+    ) {
         super(name, telemetryData);
         this.rta = rta;
         this.overlays = overlays;
         this.model = new JSONModel();
+        this.data = data;
     }
 
     /**
@@ -70,8 +82,12 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
 
         this.setEscapeHandler();
 
+        const resourceModel = await getResourceModel('open.ux.preview.client');
+        this.bundle = await getTextBundle();
+
         await this.buildDialogData();
 
+        this.dialog.setModel(resourceModel, 'i18n');
         this.dialog.setModel(this.model);
 
         this.dialog.open();
@@ -102,6 +118,13 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
 
         const fileExists = controllerList.some((f) => f.controllerName === controllerName);
 
+        const pendingChangeExists = checkForExistingChange(
+            this.rta,
+            'codeExt',
+            'content.codeRef',
+            `${controllerName}.js`
+        );
+
         if (fileExists) {
             updateDialogState(
                 ValueState.Error,
@@ -110,6 +133,14 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
             return;
         }
 
+        if (pendingChangeExists) {
+            updateDialogState(
+                ValueState.Error,
+                'Enter a different name. The controller name that you entered already exists as a pending change.'
+            );
+            return;
+        }
+
         const isValidName = /^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(controllerName);
 
         if (!isValidName) {
@@ -147,7 +178,16 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
             const controllerName = this.model.getProperty('/newControllerName');
             const viewId = this.model.getProperty('/viewId');
 
-            await this.createNewController(controllerName, viewId);
+            const controllerRef = {
+                codeRef: `coding/${controllerName}.js`,
+                viewId
+            };
+
+            if (this.data) {
+                this.data.deferred.resolve(controllerRef);
+            } else {
+                await this.createNewController(controllerName, controllerRef);
+            }
         } else {
             const controllerPath = this.model.getProperty('/controllerPath');
             window.open(`vscode://file${controllerPath}`);
@@ -166,8 +206,17 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
         const { controllerName, viewId } = getControllerInfo(overlayControl);
         const data = await this.getExistingController(controllerName);
 
+        const hasPendingChangeForView = checkForExistingChange(
+            this.rta,
+            'codeExt',
+            'selector.controllerName',
+            controllerName
+        );
+
         if (data) {
-            if (data?.controllerExists) {
+            if (hasPendingChangeForView) {
+                this.updateModelForExistingPendingChange();
+            } else if (data?.controllerExists) {
                 this.updateModelForExistingController(data);
             } else {
                 this.updateModelForNewController(viewId, data.isTsSupported);
@@ -187,14 +236,9 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
         this.model.setProperty('/controllerExists', controllerExists);
         this.model.setProperty('/controllerPath', controllerPath);
         this.model.setProperty('/controllerPathFromRoot', controllerPathFromRoot);
-
-        const content = this.dialog.getContent();
-
-        const form = content[0] as SimpleForm;
-        form.setVisible(false);
-
-        const messageForm = content[1] as SimpleForm;
-        messageForm.setVisible(true);
+        this.model.setProperty('/inputFormVisibility', false);
+        this.model.setProperty('/pendingChangeFormVisibility', false);
+        this.model.setProperty('/existingControllerFormVisibility', true);
 
         if (isRunningInBAS) {
             this.dialog.getBeginButton().setVisible(false);
@@ -204,6 +248,18 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
         this.dialog.getEndButton().setText('Close');
     }
 
+    /**
+     * Updates the model properties for an existing controller in a pending change.
+     */
+    private updateModelForExistingPendingChange(): void {
+        this.model.setProperty('/inputFormVisibility', false);
+        this.model.setProperty('/existingControllerFormVisibility', false);
+        this.model.setProperty('/pendingChangeFormVisibility', true);
+
+        this.dialog.getBeginButton().setVisible(false);
+        this.dialog.getEndButton().setText('Close');
+    }
+
     /**
      * Updates the model property for a new controller.
      *
@@ -213,6 +269,9 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
     private updateModelForNewController(viewId: string, isTsSupported: boolean): void {
         this.model.setProperty('/viewId', viewId);
         this.model.setProperty('/controllerExtension', isTsSupported ? '.ts' : '.js');
+        this.model.setProperty('/existingControllerFormVisibility', false);
+        this.model.setProperty('/pendingChangeFormVisibility', false);
+        this.model.setProperty('/inputFormVisibility', true);
     }
 
     /**
@@ -248,17 +307,20 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
      * Creates a new fragment for the specified control
      *
      * @param controllerName Controller Name
-     * @param viewId View Id
+     * @param controllerRef Controller reference
      */
-    private async createNewController(controllerName: string, viewId: string): Promise<void> {
+    private async createNewController(
+        controllerName: string,
+        controllerRef: DeferredExtendControllerData
+    ): Promise<void> {
+        const ui5Version = await getUi5Version();
+        if (!isLowerThanMinimalUi5Version(ui5Version, { major: 1, minor: 135 })) {
+            await this.createControllerCommand(controllerName, controllerRef);
+            return;
+        }
         try {
             await writeController({ controllerName });
 
-            const controllerRef = {
-                codeRef: `coding/${controllerName}.js`,
-                viewId
-            };
-
             const service = await this.rta.getService<ControllerExtensionService>('controllerExtension');
 
             const change = await service.add(controllerRef.codeRef, controllerRef.viewId);
@@ -273,4 +335,30 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
             this.handleError(e);
         }
     }
+
+    /**
+     * Creates a controller command and executes it.
+     *
+     * @param controllerName Controller name
+     * @param controllerRef Controller reference
+     */
+    private async createControllerCommand(
+        controllerName: string,
+        controllerRef: DeferredExtendControllerData
+    ): Promise<void> {
+        const flexSettings = this.rta.getFlexSettings();
+        const commandExecutor = new CommandExecutor(this.rta);
+        const view = getControlById(controllerRef.viewId) as UI5Element;
+        const command = await commandExecutor.getCommand<DeferredExtendControllerData>(
+            view,
+            'codeExt',
+            controllerRef,
+            flexSettings
+        );
+
+        await commandExecutor.pushAndExecuteCommand(command);
+
+        const bundle = await getTextBundle();
+        notifyUser(bundle.getText('ADP_CREATE_CONTROLLER_EXTENSION', [controllerName]), 8000);
+    }
 }

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

@@ -73,7 +73,7 @@ sap.ui.define(["sap/ui/core/Fragment", "../i18n", "./controllers/AddFragment.con
           }, telemetryData);
           break;
         case DialogNames.CONTROLLER_EXTENSION:
-          controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, telemetryData);
+          controller = new ControllerExtension(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, data, telemetryData);
           break;
         case DialogNames.ADD_FRAGMENT_AT_EXTENSION_POINT:
           controller = new ExtensionPoint(`open.ux.preview.client.adp.controllers.${dialogName}`, overlay, rta, data);

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

@@ -12,6 +12,7 @@ import ExtensionPoint from './controllers/ExtensionPoint.controller';
 
 import type { ExtensionPointData } from './extension-point';
 import { AddFragmentData } from './add-fragment';
+import { ExtendControllerData } from './extend-controller';
 import FileExistsDialog, { FileExistsDialogOptions } from './controllers/FileExistsDialog.controller';
 import AddSubpage, { AddSubpageOptions } from './controllers/AddSubpage.controller';
 import { QuickActionTelemetryData } from '../cpe/quick-actions/quick-action-definition';
@@ -33,7 +34,7 @@ type Controller =
     | FileExistsDialog
     | AddSubpage;
 
-type DialogData = ExtensionPointData | AddFragmentData;
+type DialogData = ExtensionPointData | AddFragmentData | ExtendControllerData;
 
 export const OPEN_DIALOG_STATUS_CHANGED = 'OPEN_DIALOG_STATUS_CHANGED';
 
@@ -106,6 +107,7 @@ export class DialogFactory {
                     `open.ux.preview.client.adp.controllers.${dialogName}`,
                     overlay,
                     rta,
+                    (data as ExtendControllerData),
                     telemetryData
                 );
                 break;