@sap-ux/preview-middleware 1.1.3 → 1.2.1

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

@@ -2,6 +2,7 @@
 import Button from 'sap/m/Button';
 import type Dialog from 'sap/m/Dialog';
 import Input from 'sap/m/Input';
+import type RadioButtonGroup from 'sap/m/RadioButtonGroup';
 
 /** sap.ui.core */
 import type UI5Element from 'sap/ui/core/Element';
@@ -25,16 +26,16 @@ import { getResourceModel, getTextBundle, TextBundle } from '../../i18n.js';
 import { getControlById } from '../../utils/core.js';
 import { getError } from '../../utils/error.js';
 import { sendInfoCenterMessage } from '../../utils/info-center-message.js';
-import { getUi5Version, isLowerThanMinimalUi5Version } from '../../utils/version.js';
+import { getUi5Version, isLowerThanMinimalUi5Version, type Ui5VersionInfo } from '../../utils/version.js';
 import type { CodeExtResponse, ControllersResponse } from '../api-handler.js';
 import { getExistingController, readControllers, writeChange, writeController } from '../api-handler.js';
 import CommandExecutor from '../command-executor.js';
 import type { DeferredExtendControllerData, ExtendControllerData } from '../extend-controller.js';
-import { checkForExistingChange, getControllerInfo } from '../utils.js';
+import { checkForExistingChange, getControllerInfo, getPendingCodeExtViewIds } from '../utils.js';
 import BaseDialog from './BaseDialog.controller.js';
 
 interface ControllerExtensionService {
-    add: (codeRef: string, viewId: string) => Promise<{ creation: string }>;
+    add: (codeRef: string, viewId: string, includeViewId?: boolean) => Promise<{ creation: string }>;
 }
 
 type ControllerList = {
@@ -49,8 +50,14 @@ type ControllerModel = JSONModel & {
     getProperty(sPath: '/controllerExists'): boolean;
     getProperty(sPath: '/newControllerName'): string;
     getProperty(sPath: '/viewId'): string;
-    getProperty(sPath: '/controllerPath'): string;
+    getProperty(sPath: '/baseControllerPath'): string;
+    getProperty(sPath: '/instanceControllerPath'): string;
     getProperty(sPath: '/controllerExtension'): string;
+    getProperty(sPath: '/isInstanceSpecific'): boolean;
+    getProperty(sPath: '/instanceSpecificVisibility'): boolean;
+    getProperty(sPath: '/baseControllerEnabled'): boolean;
+    getProperty(sPath: '/instanceControllerEnabled'): boolean;
+    getProperty(sPath: '/controllerTypeSelectedIndex'): number;
 };
 
 /**
@@ -59,8 +66,11 @@ type ControllerModel = JSONModel & {
 export default class ControllerExtension extends BaseDialog<ControllerModel> {
     /* The minimum version of UI5 framework which supports controller extensions. */
     private static readonly CONTROLLER_EXT_MIN_UI5_VERSION = { major: 1, minor: 135 };
+    /* The minimum version of UI5 framework which supports instance-specific controller extensions. */
+    private static readonly INSTANCE_SPECIFIC_MIN_UI5_VERSION = { major: 1, minor: 143 };
     public readonly data?: ExtendControllerData;
     private bundle: TextBundle;
+    private ui5Version: Ui5VersionInfo;
 
     constructor(
         name: string,
@@ -88,6 +98,7 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
 
         const resourceModel = await getResourceModel('open.ux.preview.client');
         this.bundle = await getTextBundle();
+        this.ui5Version = await getUi5Version();
 
         await this.buildDialogData();
 
@@ -181,10 +192,12 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
 
             const controllerName = this.model.getProperty('/newControllerName');
             const viewId = this.model.getProperty('/viewId');
+            const isInstanceSpecific = this.model.getProperty('/isInstanceSpecific');
 
-            const controllerRef = {
+            const controllerRef: DeferredExtendControllerData = {
                 codeRef: `coding/${controllerName}.js`,
-                viewId
+                viewId,
+                instanceSpecific: isInstanceSpecific
             };
 
             if (this.data) {
@@ -193,16 +206,13 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
                 await this.createNewController(controllerName, controllerRef);
             }
 
-            if (this.data && (await this.isControllerExtensionSupported())) {
+            if (this.data && this.isControllerExtensionSupported()) {
                 await sendInfoCenterMessage({
                     title: { key: 'ADP_CREATE_CONTROLLER_EXTENSION_TITLE' },
                     description: { key: 'ADP_CREATE_CONTROLLER_EXTENSION', params: [controllerName] },
                     type: MessageBarType.info
                 });
             }
-        } else {
-            const controllerPath = this.model.getProperty('/controllerPath');
-            window.open(`vscode://file${controllerPath}`);
         }
 
         this.handleDialogClose();
@@ -216,46 +226,68 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
         const overlayControl = sap.ui.getCore().byId(selectorId) as unknown as ElementOverlay;
 
         const { controllerName, viewId } = getControllerInfo(overlayControl);
-        const data = await this.getExistingController(controllerName);
+        const data = await this.getExistingController(controllerName, viewId);
 
-        const hasPendingChangeForView = checkForExistingChange(
-            this.rta,
-            'codeExt',
-            'selector.controllerName',
-            controllerName
-        );
+        if (!data) {
+            return;
+        }
 
-        if (data) {
-            if (hasPendingChangeForView) {
+        // Combine persisted (server) and pending (command stack) changes to determine whether a base
+        // page controller and/or an instance-specific controller for this view already exist.
+        const pendingViewIds = getPendingCodeExtViewIds(this.rta, controllerName);
+        const baseExists = data.baseControllerExists || pendingViewIds.some((id) => !id);
+        const instanceExists = data.instanceControllerExists || pendingViewIds.includes(viewId);
+
+        const showInstanceSpecificOption = this.isInstanceSpecificSupported();
+
+        if (!showInstanceSpecificOption) {
+            if (pendingViewIds.length > 0) {
                 this.updateModelForExistingPendingChange();
-            } else if (data?.controllerExists) {
-                this.updateModelForExistingController(data);
+            } else if (data.baseControllerExists) {
+                this.updateModelForExistingController(data, true);
             } else {
-                this.updateModelForNewController(viewId, data.isTsSupported);
-
+                this.updateModelForNewController(viewId, data.isTsSupported, false, false, false);
                 await this.getControllers();
             }
+            return;
         }
+
+        if (baseExists && instanceExists) {
+            if (data.baseControllerExists || data.instanceControllerExists) {
+                this.updateModelForExistingController(data);
+            } else {
+                this.updateModelForExistingPendingChange();
+            }
+            return;
+        }
+
+        this.updateModelForNewController(viewId, data.isTsSupported, true, baseExists, instanceExists);
+        await this.getControllers();
     }
     /**
-     * Updates the model properties for an existing controller.
+     * Updates the model properties for existing controller(s).
+     * Shows all persisted controllers (base and/or instance) in the existing-controller form, each with its own link to open in VS Code.
      *
-     * @param {CodeExtResponse} data - Existing controller data from the server.
+     * @param data - Server response containing existence flags and file paths.
+     * @param showVsCodeButton - When true (pre-1.143 single-controller path), shows an "Open in VS Code" begin-button instead of relying on the inline fragment links.
      */
-    private updateModelForExistingController(data: CodeExtResponse): void {
-        const { controllerExists, controllerPath, controllerPathFromRoot, isRunningInBAS } = data;
-
-        this.model.setProperty('/controllerExists', controllerExists);
-        this.model.setProperty('/controllerPath', controllerPath);
-        this.model.setProperty('/controllerPathFromRoot', controllerPathFromRoot);
+    private updateModelForExistingController(data: CodeExtResponse, showVsCodeButton = false): void {
+        this.model.setProperty('/controllerExists', true);
+        this.model.setProperty('/baseControllerExists', data.baseControllerExists);
+        this.model.setProperty('/baseControllerPath', data.baseControllerPath);
+        this.model.setProperty('/baseControllerPathFromRoot', data.baseControllerPathFromRoot);
+        this.model.setProperty('/instanceControllerExists', data.instanceControllerExists);
+        this.model.setProperty('/instanceControllerPath', data.instanceControllerPath);
+        this.model.setProperty('/instanceControllerPathFromRoot', data.instanceControllerPathFromRoot);
+        this.model.setProperty('/isRunningInBAS', data.isRunningInBAS);
         this.model.setProperty('/inputFormVisibility', false);
         this.model.setProperty('/pendingChangeFormVisibility', false);
         this.model.setProperty('/existingControllerFormVisibility', true);
 
-        if (isRunningInBAS) {
-            this.dialog.getBeginButton().setVisible(false);
-        } else {
+        if (showVsCodeButton && !data.isRunningInBAS) {
             this.dialog.getBeginButton().setText('Open in VS Code').setEnabled(true);
+        } else {
+            this.dialog.getBeginButton().setVisible(false);
         }
         this.dialog.getEndButton().setText('Close');
     }
@@ -277,25 +309,41 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
      *
      * @param {string} viewId - The view ID.
      * @param {boolean} isTsSupported - Whether TypeScript supported for the current project.
+     * @param {boolean} showInstanceSpecificOption - Whether to show the instance-specific radio button option.
+     * @param {boolean} baseExists - Whether a base page controller extension already exists.
+     * @param {boolean} instanceExists - Whether an instance-specific extension already exists for this view.
      */
-    private updateModelForNewController(viewId: string, isTsSupported: boolean): void {
+    private updateModelForNewController(
+        viewId: string,
+        isTsSupported: boolean,
+        showInstanceSpecificOption: boolean,
+        baseExists: boolean,
+        instanceExists: 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);
+        this.model.setProperty('/instanceSpecificVisibility', showInstanceSpecificOption);
+        this.model.setProperty('/baseControllerEnabled', !baseExists);
+        this.model.setProperty('/instanceControllerEnabled', !instanceExists);
+        const selectedIndex = baseExists ? 1 : 0;
+        this.model.setProperty('/controllerTypeSelectedIndex', selectedIndex);
+        this.model.setProperty('/isInstanceSpecific', selectedIndex === 1);
     }
 
     /**
      * Retrieves existing controller data if found in the project's workspace.
      *
      * @param controllerName Controller name that exists in the view.
+     * @param viewId ID of the current view, used to detect an existing instance-specific extension.
      * @returns Returns existing controller data.
      */
-    private async getExistingController(controllerName: string): Promise<CodeExtResponse | undefined> {
+    private async getExistingController(controllerName: string, viewId: string): Promise<CodeExtResponse | undefined> {
         let data: CodeExtResponse | undefined;
         try {
-            data = await getExistingController(controllerName);
+            data = await getExistingController(controllerName, viewId);
         } catch (e) {
             const error = getError(e);
             await sendInfoCenterMessage({
@@ -337,7 +385,7 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
         controllerName: string,
         controllerRef: DeferredExtendControllerData
     ): Promise<void> {
-        if (await this.isControllerExtensionSupported()) {
+        if (this.isControllerExtensionSupported()) {
             await this.createControllerCommand(controllerName, controllerRef);
             return;
         }
@@ -346,7 +394,11 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
 
             const service = await this.rta.getService<ControllerExtensionService>('controllerExtension');
 
-            const change = await service.add(controllerRef.codeRef, controllerRef.viewId);
+            const change = await service.add(
+                controllerRef.codeRef,
+                controllerRef.viewId,
+                controllerRef.instanceSpecific
+            );
             change.creation = new Date().toISOString();
 
             await writeChange(change);
@@ -401,8 +453,35 @@ export default class ControllerExtension extends BaseDialog<ControllerModel> {
         });
     }
 
-    private async isControllerExtensionSupported(): Promise<boolean> {
-        const ui5Version = await getUi5Version();
-        return !isLowerThanMinimalUi5Version(ui5Version, ControllerExtension.CONTROLLER_EXT_MIN_UI5_VERSION);
+    private isControllerExtensionSupported(): boolean {
+        return !isLowerThanMinimalUi5Version(this.ui5Version, ControllerExtension.CONTROLLER_EXT_MIN_UI5_VERSION);
+    }
+
+    /**
+     * Handles the selection change on the controller type for the radio button group.
+     *
+     * @param event Event
+     */
+    onControllerTypeSelectionChange(event: Event): void {
+        const group = event.getSource<RadioButtonGroup>();
+        this.model.setProperty('/isInstanceSpecific', group.getSelectedIndex() === 1);
+    }
+
+    /**
+     * Opens the base page controller extension file in VS Code.
+     */
+    onOpenBaseController(): void {
+        window.open(`vscode://file${this.model.getProperty('/baseControllerPath')}`);
+    }
+
+    /**
+     * Opens the instance-specific controller extension file in VS Code.
+     */
+    onOpenInstanceController(): void {
+        window.open(`vscode://file${this.model.getProperty('/instanceControllerPath')}`);
+    }
+
+    private isInstanceSpecificSupported(): boolean {
+        return !isLowerThanMinimalUi5Version(this.ui5Version, ControllerExtension.INSTANCE_SPECIFIC_MIN_UI5_VERSION);
     }
 }

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

@@ -12,6 +12,7 @@ export interface ExtendControllerData {
 export type DeferredExtendControllerData = {
     codeRef: string;
     viewId: string;
+    instanceSpecific: boolean;
 };
 
 /**

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

@@ -44,8 +44,8 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../../utils/version", "../../uti
       const control = getRelevantControlFromActivePage(this.context.controlIndex, this.context.view, CONTROL_TYPES)[0];
       if (control) {
         const controlInfo = getControllerInfoForControl(control);
-        const data = await getExistingController(controlInfo.controllerName);
-        this.controllerExists = data?.controllerExists;
+        const data = await getExistingController(controlInfo.controllerName, controlInfo.viewId);
+        this.controllerExists = data?.baseControllerExists || data?.instanceControllerExists;
         const isActiveAction = isControllerExtensionEnabledForControl(control, isReuseComponent, this.context.flexSettings.isCloud);
         this.control = isActiveAction ? control : undefined;
       }

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

@@ -60,8 +60,8 @@ export class AddControllerToPageQuickAction
         )[0];
         if (control) {
             const controlInfo = getControllerInfoForControl(control);
-            const data = await getExistingController(controlInfo.controllerName);
-            this.controllerExists = data?.controllerExists;
+            const data = await getExistingController(controlInfo.controllerName, controlInfo.viewId);
+            this.controllerExists = data?.baseControllerExists || data?.instanceControllerExists;
             const isActiveAction = isControllerExtensionEnabledForControl(
                 control,
                 isReuseComponent,

package/dist/client/adp/quick-actions/fe-v4/create-page-action.js

@@ -40,8 +40,9 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../dialog-factory", "../simple-q
       if (this.control) {
         const overlay = OverlayRegistry.getOverlay(this.control) || [];
         const controlInfo = getControllerInfoForControl(this.control);
-        const data = await getExistingController(controlInfo.controllerName);
-        const controllerPath = data.controllerPathFromRoot.replaceAll(/\//g, '.').replace(/\.[^.]+$/, '');
+        const data = await getExistingController(controlInfo.controllerName, controlInfo.viewId);
+        const controllerPathFromRoot = data.baseControllerPathFromRoot || data.instanceControllerPathFromRoot || '';
+        const controllerPath = controllerPathFromRoot.replaceAll('/', '.').replace(/\.[^.]+$/, '');
         await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_ACTION, undefined, {
           title: 'QUICK_ACTION_ADD_CUSTOM_PAGE_ACTION',
           controllerReference: controllerPath ? `.extension.${controllerPath}.<REPLACE_WITH_YOUR_HANDLER_NAME>` : '.extension.<ApplicationId.FolderName.ScriptFilename.methodName>',

package/dist/client/adp/quick-actions/fe-v4/create-page-action.ts

@@ -43,8 +43,9 @@ export class AddPageActionQuickAction extends SimpleQuickActionDefinitionBase im
         if (this.control) {
             const overlay = OverlayRegistry.getOverlay(this.control) || [];
             const controlInfo = getControllerInfoForControl(this.control);
-            const data = await getExistingController(controlInfo.controllerName);
-            const controllerPath = data.controllerPathFromRoot.replaceAll(/\//g, '.').replace(/\.[^.]+$/, '');
+            const data = await getExistingController(controlInfo.controllerName, controlInfo.viewId);
+            const controllerPathFromRoot = data.baseControllerPathFromRoot || data.instanceControllerPathFromRoot || '';
+            const controllerPath = controllerPathFromRoot.replaceAll('/', '.').replace(/\.[^.]+$/, '');
             await DialogFactory.createDialog(
                 overlay,
                 this.context.rta,

package/dist/client/adp/quick-actions/fe-v4/create-table-action-config-change.js

@@ -50,8 +50,9 @@ sap.ui.define(["sap/ui/dt/OverlayRegistry", "../../dialog-factory", "../../../ut
       if (table) {
         const overlay = OverlayRegistry.getOverlay(table) || [];
         const controlInfo = getControllerInfoForControl(table);
-        const data = await getExistingController(controlInfo.controllerName);
-        const controllerPath = data.controllerPathFromRoot.replaceAll('/', '.').replace(/\.[^.]+$/, '');
+        const data = await getExistingController(controlInfo.controllerName, controlInfo.viewId);
+        const controllerPathFromRoot = data.baseControllerPathFromRoot || data.instanceControllerPathFromRoot || '';
+        const controllerPath = controllerPathFromRoot.replaceAll('/', '.').replace(/\.[^.]+$/, '');
         await DialogFactory.createDialog(overlay, this.context.rta, DialogNames.ADD_ACTION, undefined, {
           title: 'QUICK_ACTION_ADD_CUSTOM_TABLE_ACTION',
           controllerReference: controllerPath ? `.extension.${controllerPath}.<methodName>` : '.extension.<ApplicationId.FolderName.ScriptFilename.methodName>',

package/dist/client/adp/quick-actions/fe-v4/create-table-action-config-change.ts

@@ -52,8 +52,9 @@ export class AddTableActionQuickAction extends TableQuickActionDefinitionBase im
         if (table) {
             const overlay = OverlayRegistry.getOverlay(table) || [];
             const controlInfo = getControllerInfoForControl(table);
-            const data = await getExistingController(controlInfo.controllerName);
-            const controllerPath = data.controllerPathFromRoot.replaceAll('/', '.').replace(/\.[^.]+$/, '');
+            const data = await getExistingController(controlInfo.controllerName, controlInfo.viewId);
+            const controllerPathFromRoot = data.baseControllerPathFromRoot || data.instanceControllerPathFromRoot || '';
+            const controllerPath = controllerPathFromRoot.replaceAll('/', '.').replace(/\.[^.]+$/, '');
             await DialogFactory.createDialog(
                 overlay,
                 this.context.rta,

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

@@ -1,10 +1,10 @@
-<Dialog id="controllerExtensionDialog"  
+<Dialog id="controllerExtensionDialog"
     xmlns:mvc="sap.ui.core.mvc"
     xmlns="sap.m"
     xmlns:core="sap.ui.core"
-    xmlns:f="sap.ui.layout.form" 
-    title="Extend With Controller" 
-    contentWidth="450px" 
+    xmlns:f="sap.ui.layout.form"
+    title="Extend With Controller"
+    contentWidth="450px"
     class="sapUiRTABorder">
     <content>
         <f:SimpleForm
@@ -15,12 +15,28 @@
             visible="{/inputFormVisibility}">
             <f:content>
                 <Label text="Controller Name" />
-                <Input 
+                <Input
                     id="controllerName"
                     description="{/controllerExtension}"
                     value="{/newControllerName}"
                     liveChange="onControllerNameInputChange">
                 </Input>
+                <Label text="{i18n>ADP_CONTROLLER_TYPE_SELECTION_LABEL}"
+                       visible="{/instanceSpecificVisibility}" />
+                <RadioButtonGroup
+                    id="controllerTypeGroup"
+                    select="onControllerTypeSelectionChange"
+                    selectedIndex="{/controllerTypeSelectedIndex}"
+                    visible="{/instanceSpecificVisibility}">
+                    <buttons>
+                        <RadioButton id="baseControllerRadio"
+                                     text="{i18n>ADP_CONTROLLER_TYPE_BASE}"
+                                     enabled="{/baseControllerEnabled}" />
+                        <RadioButton id="instanceControllerRadio"
+                                     text="{i18n>ADP_CONTROLLER_TYPE_INSTANCE}"
+                                     enabled="{/instanceControllerEnabled}" />
+                    </buttons>
+                </RadioButtonGroup>
             </f:content>
         </f:SimpleForm>
         <f:SimpleForm
@@ -31,7 +47,18 @@
             singleContainerFullSize="false">
             <f:content>
                 <Label text="{i18n>ADP_CONTROLLER_EXTENSION_EXISTS}" />
-                <Text text="{/controllerPathFromRoot}" />
+
+                <Label text="{i18n>ADP_CONTROLLER_TYPE_BASE}" visible="{/baseControllerExists}" />
+                <Link text="{/baseControllerPathFromRoot}" press="onOpenBaseController"
+                      visible="{= ${/baseControllerExists} &amp;&amp; !${/isRunningInBAS} }" />
+                <Text text="{/baseControllerPathFromRoot}"
+                      visible="{= ${/baseControllerExists} &amp;&amp; ${/isRunningInBAS} }" />
+
+                <Label text="{i18n>ADP_CONTROLLER_TYPE_INSTANCE}" visible="{/instanceControllerExists}" />
+                <Link text="{/instanceControllerPathFromRoot}" press="onOpenInstanceController"
+                      visible="{= ${/instanceControllerExists} &amp;&amp; !${/isRunningInBAS} }" />
+                <Text text="{/instanceControllerPathFromRoot}"
+                      visible="{= ${/instanceControllerExists} &amp;&amp; ${/isRunningInBAS} }" />
             </f:content>
         </f:SimpleForm>
         <f:SimpleForm

package/dist/client/adp/utils.js

@@ -107,6 +107,58 @@ sap.ui.define(["sap/ui/fl/Utils", "../utils/core", "../utils/changes", "../utils
       return typeof nestedProperty === 'string' ? nestedProperty.includes(propertyValue) : false;
     });
   }
+
+  /**
+   * Collects the `content.viewId` values of all pending `codeExt` changes in the RTA command stack for a
+   * given controller. A base page controller extension has no `viewId` (yields `undefined`), while an
+   * instance-specific extension yields the ID of the view it is bound to.
+   *
+   * @param {RuntimeAuthoring} rta - The RuntimeAuthoring instance to inspect.
+   * @param {string} controllerName - The controller name to match against `selector.controllerName`.
+   * @returns {(string | undefined)[]} The `content.viewId` of each matching pending codeExt change.
+   */
+  function getPendingCodeExtViewIds(rta, controllerName) {
+    const allCommands = rta.getCommandStack().getCommands();
+    const viewIds = [];
+    const collectFromCommand = command => {
+      getFlexChangeList(command).forEach(change => {
+        const changeDefinition = getChangeDefinition(change);
+        if (getNestedProperty(changeDefinition, 'changeType') !== 'codeExt') {
+          return;
+        }
+        if (getNestedProperty(changeDefinition, 'selector.controllerName') !== controllerName) {
+          return;
+        }
+        const viewId = getNestedProperty(changeDefinition, 'content.viewId');
+        viewIds.push(typeof viewId === 'string' ? viewId : undefined);
+      });
+    };
+    allCommands.forEach(command => {
+      if (typeof command.getCommands === 'function') {
+        command.getCommands().forEach(subCommand => {
+          if (subCommand?.getProperty('name') === 'codeExt') {
+            collectFromCommand(subCommand);
+          }
+        });
+      } else {
+        collectFromCommand(command);
+      }
+    });
+    return viewIds;
+  }
+  /**
+   * Resolves the controller name of a view, preferring the typed controller module name and falling
+   * back to the controller instance's metadata name. Returns an empty string when the view owns no
+   * controller.
+   *
+   * @param view The view for which to resolve the controller name.
+   * @returns The controller name (`module:...` or class name), or an empty string when none is resolvable.
+   */
+  function resolveControllerName(view) {
+    const moduleName = view?.getControllerModuleName?.();
+    return moduleName ? `module:${moduleName}` : view?.getController?.()?.getMetadata?.().getName() ?? '';
+  }
+
   /**
    * Gets controller name and view ID for the given UI5 control.
    *
@@ -114,13 +166,28 @@ sap.ui.define(["sap/ui/fl/Utils", "../utils/core", "../utils/changes", "../utils
    * @returns The controller name and view ID.
    */
   function getControllerInfoForControl(control) {
-    const view = FlexUtils.getViewForControl(control);
-    const moduleName = view?.getControllerModuleName?.();
-    const controllerName = moduleName ? `module:${moduleName}` : view.getController()?.getMetadata().getName();
-    const viewId = view.getId();
+    let view = FlexUtils.getViewForControl(control);
+    let controllerName = resolveControllerName(view);
+    while (!controllerName) {
+      const parent = view?.getParent?.();
+      if (!parent) {
+        break;
+      }
+      const parentView = FlexUtils.getViewForControl(parent);
+      if (!parentView || parentView === view) {
+        break;
+      }
+      view = parentView;
+      controllerName = resolveControllerName(view);
+    }
+
+    // viewId is intentionally the controller-bearing view's ID (which may be an ancestor of the
+    // original view). The change file binds controllerName and viewId as a pair — returning the
+    // innermost view's ID when it has no controller would create an inconsistent pair that the
+    // server could never match.
     return {
       controllerName,
-      viewId
+      viewId: view.getId()
     };
   }
 
@@ -189,6 +256,7 @@ sap.ui.define(["sap/ui/fl/Utils", "../utils/core", "../utils/changes", "../utils
   __exports.checkForExistingChange = checkForExistingChange;
   __exports.getNestedProperty = getNestedProperty;
   __exports.matchesChangeProperty = matchesChangeProperty;
+  __exports.getPendingCodeExtViewIds = getPendingCodeExtViewIds;
   __exports.getControllerInfoForControl = getControllerInfoForControl;
   __exports.getControllerInfo = getControllerInfo;
   __exports.getReuseComponentChecker = getReuseComponentChecker;

package/dist/client/adp/utils.ts

@@ -113,11 +113,74 @@ export function matchesChangeProperty(command: FlexCommand, propertyPath: string
         return typeof nestedProperty === 'string' ? nestedProperty.includes(propertyValue) : false;
     });
 }
+
+/**
+ * Collects the `content.viewId` values of all pending `codeExt` changes in the RTA command stack for a
+ * given controller. A base page controller extension has no `viewId` (yields `undefined`), while an
+ * instance-specific extension yields the ID of the view it is bound to.
+ *
+ * @param {RuntimeAuthoring} rta - The RuntimeAuthoring instance to inspect.
+ * @param {string} controllerName - The controller name to match against `selector.controllerName`.
+ * @returns {(string | undefined)[]} The `content.viewId` of each matching pending codeExt change.
+ */
+export function getPendingCodeExtViewIds(rta: RuntimeAuthoring, controllerName: string): (string | undefined)[] {
+    const allCommands = rta.getCommandStack().getCommands();
+    const viewIds: (string | undefined)[] = [];
+
+    const collectFromCommand = (command: FlexCommand): void => {
+        getFlexChangeList(command).forEach((change) => {
+            const changeDefinition = getChangeDefinition(change);
+            if (getNestedProperty(changeDefinition, 'changeType') !== 'codeExt') {
+                return;
+            }
+            if (getNestedProperty(changeDefinition, 'selector.controllerName') !== controllerName) {
+                return;
+            }
+            const viewId = getNestedProperty(changeDefinition, 'content.viewId');
+            viewIds.push(typeof viewId === 'string' ? viewId : undefined);
+        });
+    };
+
+    allCommands.forEach((command: FlexCommand) => {
+        if (typeof command.getCommands === 'function') {
+            command.getCommands().forEach((subCommand: FlexCommand) => {
+                if (subCommand?.getProperty('name') === 'codeExt') {
+                    collectFromCommand(subCommand);
+                }
+            });
+        } else {
+            collectFromCommand(command);
+        }
+    });
+
+    return viewIds;
+}
+
 interface ControllerInfo {
     controllerName: string;
     viewId: string;
 }
 
+interface ViewLike {
+    getId(): string;
+    getControllerModuleName?(): string | undefined;
+    getController?(): { getMetadata(): { getName(): string } } | undefined;
+    getParent?(): ManagedObject | null;
+}
+
+/**
+ * Resolves the controller name of a view, preferring the typed controller module name and falling
+ * back to the controller instance's metadata name. Returns an empty string when the view owns no
+ * controller.
+ *
+ * @param view The view for which to resolve the controller name.
+ * @returns The controller name (`module:...` or class name), or an empty string when none is resolvable.
+ */
+function resolveControllerName(view: ViewLike): string {
+    const moduleName = view?.getControllerModuleName?.();
+    return moduleName ? `module:${moduleName}` : view?.getController?.()?.getMetadata?.().getName() ?? '';
+}
+
 /**
  * Gets controller name and view ID for the given UI5 control.
  *
@@ -125,11 +188,27 @@ interface ControllerInfo {
  * @returns The controller name and view ID.
  */
 export function getControllerInfoForControl(control: ManagedObject): ControllerInfo {
-    const view = FlexUtils.getViewForControl(control);
-    const moduleName = view?.getControllerModuleName?.();
-    const controllerName = moduleName ? `module:${moduleName}` : view.getController()?.getMetadata().getName();
-    const viewId = view.getId();
-    return { controllerName, viewId };
+    let view = FlexUtils.getViewForControl(control) as ViewLike;
+    let controllerName = resolveControllerName(view);
+
+    while (!controllerName) {
+        const parent = view?.getParent?.();
+        if (!parent) {
+            break;
+        }
+        const parentView = FlexUtils.getViewForControl(parent) as ViewLike;
+        if (!parentView || parentView === view) {
+            break;
+        }
+        view = parentView;
+        controllerName = resolveControllerName(view);
+    }
+
+    // viewId is intentionally the controller-bearing view's ID (which may be an ancestor of the
+    // original view). The change file binds controllerName and viewId as a pair — returning the
+    // innermost view's ID when it has no controller would create an inconsistent pair that the
+    // server could never match.
+    return { controllerName, viewId: view.getId() };
 }
 
 /**