@sap-ux/preview-middleware 0.11.14 → 0.11.16

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

@@ -62,11 +62,6 @@ sap.ui.define(["sap/m/MessageToast", "sap/ui/model/json/JSONModel", "sap/ui/dt/O
       this.model.setProperty('/index', updatedIndexArray);
       this.model.setProperty('/selectedIndex', updatedIndexArray.length - 1);
     },
-    onIndexChanged: function _onIndexChanged(event) {
-      const source = event.getSource();
-      const selectedIndex = source.getSelectedItem()?.getText();
-      this.model.setProperty('/selectedIndex', selectedIndex);
-    },
     onCreateBtnPress: async function _onCreateBtnPress(event) {
       const source = event.getSource();
       source.setEnabled(false);

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

@@ -60,20 +60,25 @@ export default class AddFragment extends BaseDialog {
     }
 
     /**
-    * Handles the index field whenever a specific aggregation is chosen
-    * 
-    * @param specialIndexAggregation string | number
-    */
+     * Handles the index field whenever a specific aggregation is chosen
+     *
+     * @param specialIndexAggregation string | number
+     */
     private specialIndexHandling(specialIndexAggregation: string | number): void {
         const overlay = OverlayRegistry.getOverlay(this.runtimeControl as UI5Element);
         const aggregations = overlay.getDesignTimeMetadata().getData().aggregations;
 
-        if(specialIndexAggregation in aggregations && 'specialIndexHandling' in aggregations[specialIndexAggregation]) {
+        if (
+            specialIndexAggregation in aggregations &&
+            'specialIndexHandling' in aggregations[specialIndexAggregation]
+        ) {
             const controlType = this.runtimeControl.getMetadata().getName();
             this.model.setProperty('/indexHandlingFlag', false);
             this.model.setProperty('/specialIndexHandlingIcon', true);
-            this.model.setProperty('/iconTooltip', `Index is defined by special logic of ${controlType} and can't be set here`);
-            
+            this.model.setProperty(
+                '/iconTooltip',
+                `Index is defined by special logic of ${controlType} and can't be set here`
+            );
         } else {
             this.model.setProperty('/indexHandlingFlag', true);
             this.model.setProperty('/specialIndexHandlingIcon', false);
@@ -107,7 +112,7 @@ export default class AddFragment extends BaseDialog {
         newSelectedControlChildren = newSelectedControlChildren.map((key) => {
             return parseInt(key);
         });
-        
+
         this.specialIndexHandling(selectedItemText);
 
         const updatedIndexArray: { key: number; value: number }[] = this.fillIndexArray(newSelectedControlChildren);
@@ -116,17 +121,6 @@ export default class AddFragment extends BaseDialog {
         this.model.setProperty('/selectedIndex', updatedIndexArray.length - 1);
     }
 
-    /**
-     * Handles the change in target indexes
-     *
-     * @param event Event
-     */
-    onIndexChanged(event: Event) {
-        const source = event.getSource<ComboBox>();
-        const selectedIndex = source.getSelectedItem()?.getText();
-        this.model.setProperty('/selectedIndex', selectedIndex);
-    }
-
     /**
      * Handles create button press
      *

package/dist/client/adp/ui/AddFragment.view.xml

@@ -13,7 +13,7 @@
                         <Label text="Control Type" />
                         <Text text="{/selectedControlName}" />
                         <Label text="Target Aggregation" />
-                        <ComboBox
+                        <Select
                             change="onAggregationChanged"
                             selectedKey="{/selectedAggregation/key}"
                             items="{
@@ -21,10 +21,10 @@
                                 sorter: { path: 'text' }
                             }">
                             <core:Item key="{key}" text="{value}" />
-                        </ComboBox>
+                        </Select>
                         <Label text="Index" />
                         <HBox alignItems="Center">
-                            <ComboBox
+                            <Select
                                 enabled="{/indexHandlingFlag}"
                                 selectedKey='{/selectedIndex}'
                                 items="{
@@ -32,7 +32,7 @@
                                     sorter: { path: 'text' }
                                 }">
                                 <core:Item key="{key}" text="{value}" />
-                            </ComboBox>
+                            </Select>
                             <core:Icon
                                 useIconTooltip="false"
                                 visible="{/specialIndexHandlingIcon}" 

package/dist/client/cpe/changes/service.js

@@ -196,7 +196,7 @@ sap.ui.define([
                     controlId: selectorId,
                     changeType,
                     isActive: index >= inactiveCommandCount,
-                    controlName: command.getElement().getMetadata().getName().split('.').pop() ?? ''
+                    controlName: changeType === 'addXMLAtExtensionPoint' ? command.getSelector().name ?? '' : command.getElement().getMetadata().getName().split('.').pop() ?? ''
                 };
             }
             return result;
@@ -204,7 +204,11 @@ sap.ui.define([
         retryOperations(operations) {
             for (const operation of operations) {
                 try {
-                    return operation();
+                    const result = operation();
+                    if (!result) {
+                        continue;
+                    }
+                    return result;
                 } catch (error) {
                     Log.error(`Retry operation failed: ${ error?.message }`);
                     continue;
@@ -221,7 +225,9 @@ sap.ui.define([
         getCommandSelectorId(command) {
             return this.retryOperations([
                 () => command.getSelector().id,
-                () => command.getElement().getProperty('persistencyKey')
+                () => command.getElement().getProperty('persistencyKey'),
+                () => command.getElement().getId(),
+                () => command.getParent()?.getElement().getId()
             ]);
         }
     }

package/dist/client/cpe/changes/service.ts

@@ -316,7 +316,10 @@ export class ChangeService {
                 controlId: selectorId,
                 changeType,
                 isActive: index >= inactiveCommandCount,
-                controlName: command.getElement().getMetadata().getName().split('.').pop() ?? ''
+                controlName:
+                    changeType === 'addXMLAtExtensionPoint'
+                        ? command.getSelector().name ?? ''
+                        : command.getElement().getMetadata().getName().split('.').pop() ?? ''
             };
         }
 
@@ -332,7 +335,11 @@ export class ChangeService {
     private retryOperations<T>(operations: Array<() => T>): T | undefined {
         for (const operation of operations) {
             try {
-                return operation();
+                const result = operation();
+                if (!result) {
+                    continue;
+                }
+                return result;
             } catch (error) {
                 Log.error(`Retry operation failed: ${error?.message}`);
                 continue;
@@ -363,7 +370,9 @@ export class ChangeService {
     private getCommandSelectorId(command: FlexCommand): string | undefined {
         return this.retryOperations([
             () => command.getSelector().id,
-            () => command.getElement().getProperty('persistencyKey')
+            () => command.getElement().getProperty('persistencyKey'),
+            () => command.getElement().getId(),
+            () => command.getParent()?.getElement().getId()
         ]);
     }
 }

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "0.11.14",
+  "version": "0.11.16",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -38,7 +38,7 @@
     "supertest": "6.3.3",
     "@sap-ux-private/playwright": "0.0.1",
     "dotenv": "16.3.1",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.8.8",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.8.10",
     "@sap-ux/project-access": "1.16.1",
     "@sap-ux/store": "0.4.0"
   },