@sap-ux/preview-middleware 0.11.3 → 0.11.4

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

@@ -142,10 +142,16 @@ sap.ui.define([
                         if (typeof command.getCommands === 'function') {
                             const subCommands = command.getCommands();
                             subCommands.forEach(command => {
-                                activeChanges.push(this.prepareChangeType(command, inactiveCommandCount, i));
+                                const pendingChange = this.prepareChangeType(command, inactiveCommandCount, i);
+                                if (pendingChange) {
+                                    activeChanges.push(pendingChange);
+                                }
                             });
                         } else {
-                            activeChanges.push(this.prepareChangeType(command, inactiveCommandCount, i));
+                            const pendingChange = this.prepareChangeType(command, inactiveCommandCount, i);
+                            if (pendingChange) {
+                                activeChanges.push(pendingChange);
+                            }
                         }
                     } catch (error) {
                         Log.error('CPE: Change creation Failed', error);
@@ -161,8 +167,11 @@ sap.ui.define([
         prepareChangeType(command, inactiveCommandCount, index) {
             let result;
             let value = '';
-            const selector = command.getSelector();
-            const changeType = command.getChangeType();
+            const selectorId = this.getCommandSelectorId(command);
+            const changeType = this.getCommandChangeType(command);
+            if (!selectorId || !changeType) {
+                return undefined;
+            }
             switch (changeType) {
             case 'propertyChange':
                 value = command.getProperty('newValue');
@@ -175,7 +184,7 @@ sap.ui.define([
                 result = {
                     type: 'pending',
                     changeType,
-                    controlId: selector.id,
+                    controlId: selectorId,
                     propertyName: command.getProperty('propertyName'),
                     isActive: index >= inactiveCommandCount,
                     value,
@@ -184,7 +193,7 @@ sap.ui.define([
             } else {
                 result = {
                     type: 'pending',
-                    controlId: selector.id,
+                    controlId: selectorId,
                     changeType,
                     isActive: index >= inactiveCommandCount,
                     controlName: command.getElement().getMetadata().getName().split('.').pop() ?? ''
@@ -192,6 +201,29 @@ sap.ui.define([
             }
             return result;
         }
+        retryOperations(operations) {
+            for (const operation of operations) {
+                try {
+                    return operation();
+                } catch (error) {
+                    Log.error(`Retry operation failed: ${ error?.message }`);
+                    continue;
+                }
+            }
+            return undefined;
+        }
+        getCommandChangeType(command) {
+            return this.retryOperations([
+                () => command.getChangeType(),
+                () => command.getPreparedChange().getDefinition().changeType
+            ]);
+        }
+        getCommandSelectorId(command) {
+            return this.retryOperations([
+                () => command.getSelector().id,
+                () => command.getElement().getProperty('persistencyKey')
+            ]);
+        }
     }
     var __exports = { __esModule: true };
     __exports.ChangeService = ChangeService;

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

@@ -16,7 +16,7 @@ import type { SelectionService } from '../selection';
 
 import type { ActionSenderFunction, SubscribeFunction, UI5AdaptationOptions } from '../types';
 import type Event from 'sap/ui/base/Event';
-import type BaseCommand from 'sap/ui/rta/command/BaseCommand';
+import type FlexCommand from 'sap/ui/rta/command/FlexCommand';
 import Log from 'sap/base/Log';
 
 interface ChangeContent {
@@ -247,15 +247,21 @@ export class ChangeService {
             const executedCommands = stack.getAllExecutedCommands();
             const inactiveCommandCount = allCommands.length - executedCommands.length;
             let activeChanges: PendingChange[] = [];
-            allCommands.forEach((command: BaseCommand, i): void => {
+            allCommands.forEach((command: FlexCommand, i): void => {
                 try {
                     if (typeof command.getCommands === 'function') {
                         const subCommands = command.getCommands();
                         subCommands.forEach((command) => {
-                            activeChanges.push(this.prepareChangeType(command, inactiveCommandCount, i));
+                            const pendingChange = this.prepareChangeType(command, inactiveCommandCount, i);
+                            if (pendingChange) {
+                                activeChanges.push(pendingChange);
+                            }
                         });
                     } else {
-                        activeChanges.push(this.prepareChangeType(command, inactiveCommandCount, i));
+                        const pendingChange = this.prepareChangeType(command, inactiveCommandCount, i);
+                        if (pendingChange) {
+                            activeChanges.push(pendingChange);
+                        }
                     }
                 } catch (error) {
                     Log.error('CPE: Change creation Failed', error);
@@ -272,11 +278,20 @@ export class ChangeService {
         };
     }
 
-    private prepareChangeType(command: BaseCommand, inactiveCommandCount: number, index: number): PendingChange {
+    private prepareChangeType(
+        command: FlexCommand,
+        inactiveCommandCount: number,
+        index: number
+    ): PendingChange | undefined {
         let result: PendingChange;
         let value = '';
-        const selector = command.getSelector();
-        const changeType = command.getChangeType();
+        const selectorId = this.getCommandSelectorId(command);
+        const changeType = this.getCommandChangeType(command);
+
+        if (!selectorId || !changeType) {
+            return undefined;
+        }
+
         switch (changeType) {
             case 'propertyChange':
                 value = command.getProperty('newValue');
@@ -289,7 +304,7 @@ export class ChangeService {
             result = {
                 type: 'pending',
                 changeType,
-                controlId: selector.id,
+                controlId: selectorId,
                 propertyName: command.getProperty('propertyName'),
                 isActive: index >= inactiveCommandCount,
                 value,
@@ -298,7 +313,7 @@ export class ChangeService {
         } else {
             result = {
                 type: 'pending',
-                controlId: selector.id,
+                controlId: selectorId,
                 changeType,
                 isActive: index >= inactiveCommandCount,
                 controlName: command.getElement().getMetadata().getName().split('.').pop() ?? ''
@@ -307,4 +322,48 @@ export class ChangeService {
 
         return result;
     }
+
+    /**
+     * Retry operations.
+     *
+     * @param operations to be executed
+     * @returns first successfull operation result or undefined
+     */
+    private retryOperations<T>(operations: Array<() => T>): T | undefined {
+        for (const operation of operations) {
+            try {
+                return operation();
+            } catch (error) {
+                Log.error(`Retry operation failed: ${error?.message}`);
+                continue;
+            }
+        }
+        return undefined;
+    }
+
+    /**
+     * Get command change type.
+     *
+     * @param command to be executed for creating change
+     * @returns command change type or undefined
+     */
+    private getCommandChangeType(command: FlexCommand): string | undefined {
+        return this.retryOperations([
+            () => command.getChangeType(),
+            () => command.getPreparedChange().getDefinition().changeType
+        ]);
+    }
+
+    /**
+     * Get command selector id.
+     *
+     * @param command to be executed for creating change
+     * @returns command selector id or undefined
+     */
+    private getCommandSelectorId(command: FlexCommand): string | undefined {
+        return this.retryOperations([
+            () => command.getSelector().id,
+            () => command.getElement().getProperty('persistencyKey')
+        ]);
+    }
 }

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.3",
+  "version": "0.11.4",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -24,8 +24,8 @@
   "dependencies": {
     "ejs": "3.1.9",
     "@sap-ux/logger": "0.4.0",
-    "@sap-ux/adp-tooling": "0.7.1",
-    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.2"
+    "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.3",
+    "@sap-ux/adp-tooling": "0.7.1"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -36,7 +36,7 @@
     "npm-run-all": "4.1.5",
     "nock": "13.2.1",
     "supertest": "6.3.3",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.8.1",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.8.2",
     "@sap-ux/project-access": "1.15.5",
     "@sap-ux/store": "0.4.0"
   },