@sap-ux/preview-middleware 0.20.0 → 0.20.2

package/dist/client/adp/control-utils.js

@@ -1,46 +1,46 @@
-"use strict";
-
-sap.ui.define([], function () {
-  "use strict";
-
-  /**
-   * Handles calling control specific functions for retrieving control data
-   */
-  class ControlUtils {
-    /**
-     * Returns ManagedObject runtime control
-     *
-     * @param overlayControl Overlay
-     * @returns {ManagedObject} Managed Object instance
-     */
-    static getRuntimeControl(overlayControl) {
-      let runtimeControl;
-      if (overlayControl.getElementInstance) {
-        runtimeControl = overlayControl.getElementInstance();
-      } else {
-        runtimeControl = overlayControl.getElement();
-      }
-      return runtimeControl;
-    }
-
-    /**
-     * Returns control aggregation names in an array
-     *
-     * @param control Managed Object runtime control
-     * @param name Aggregation name
-     * @returns Array of control aggregations
-     */
-    static getControlAggregationByName(control, name) {
-      let result = [];
-      const aggregation = (control ? control.getMetadata().getAllAggregations() : {})[name];
-      if (aggregation) {
-        // This executes a _sGetter function that can vary from control to control (_sGetter can be: getContent, getItems, etc)
-        const names = aggregation._sGetter && control[aggregation._sGetter]() || [];
-        result = Array.isArray(names) ? names : [names];
-      }
-      return result;
-    }
-  }
-  return ControlUtils;
+"use strict";
+
+sap.ui.define([], function () {
+  "use strict";
+
+  /**
+   * Handles calling control specific functions for retrieving control data
+   */
+  class ControlUtils {
+    /**
+     * Returns ManagedObject runtime control
+     *
+     * @param overlayControl Overlay
+     * @returns {ManagedObject} Managed Object instance
+     */
+    static getRuntimeControl(overlayControl) {
+      let runtimeControl;
+      if (overlayControl.getElementInstance) {
+        runtimeControl = overlayControl.getElementInstance();
+      } else {
+        runtimeControl = overlayControl.getElement();
+      }
+      return runtimeControl;
+    }
+
+    /**
+     * Returns control aggregation names in an array
+     *
+     * @param control Managed Object runtime control
+     * @param name Aggregation name
+     * @returns Array of control aggregations
+     */
+    static getControlAggregationByName(control, name) {
+      let result = [];
+      const aggregation = (control ? control.getMetadata().getAllAggregations() : {})[name];
+      if (aggregation) {
+        // This executes a _sGetter function that can vary from control to control (_sGetter can be: getContent, getItems, etc)
+        const names = aggregation._sGetter && control[aggregation._sGetter]() || [];
+        result = Array.isArray(names) ? names : [names];
+      }
+      return result;
+    }
+  }
+  return ControlUtils;
 });
 //# sourceMappingURL=control-utils.js.map

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.
      */