@sap-ux/preview-middleware 0.10.5 → 0.10.7

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

@@ -39,6 +39,7 @@ sap.ui.define([
             this.selectionService = selectionService;
         }
         async init(sendAction, subscribe) {
+            this.sendAction = sendAction;
             subscribe(async action => {
                 if (changeProperty.match(action)) {
                     try {
@@ -63,6 +64,18 @@ sap.ui.define([
                     await this.deleteChange(action.payload.controlId, action.payload.propertyName, action.payload.fileName);
                 }
             });
+            await this.fetchSavedChanges();
+            this.updateStack();
+            this.options.rta.attachUndoRedoStackModified(this.createOnStackChangeHandler());
+        }
+        updateStack() {
+            let pendingChanges = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+            this.sendAction(changeStackModified({
+                saved: this.savedChanges,
+                pending: pendingChanges
+            }));
+        }
+        async fetchSavedChanges() {
             const savedChangesResponse = await fetch(FlexChangesEndPoints.changes + `?_=${ Date.now() }`);
             const savedChanges = await savedChangesResponse.json();
             const changes = Object.keys(savedChanges ?? {}).map(key => {
@@ -106,11 +119,6 @@ sap.ui.define([
                 }
             }).filter(change => !!change).sort((a, b) => b.timestamp - a.timestamp);
             this.savedChanges = changes;
-            sendAction(changeStackModified({
-                saved: changes,
-                pending: []
-            }));
-            this.options.rta.attachUndoRedoStackModified(this.createOnStackChangeHandler(sendAction));
         }
         async deleteChange(controlId, propertyName, fileName) {
             const filesToDelete = this.savedChanges.filter(change => fileName ? fileName === change.fileName : change.controlId === controlId && change.propertyName === propertyName).map(change => fetch(FlexChangesEndPoints.changes, {
@@ -119,9 +127,11 @@ sap.ui.define([
                 body: JSON.stringify({ fileName: change.fileName })
             }));
             await Promise.all(filesToDelete).catch(error => Log.error(error));
+            await this.fetchSavedChanges();
+            this.updateStack();
         }
-        createOnStackChangeHandler(sendAction) {
-            return () => {
+        createOnStackChangeHandler() {
+            return async () => {
                 const stack = this.options.rta.getCommandStack();
                 const allCommands = stack.getCommands();
                 const executedCommands = stack.getAllExecutedCommands();
@@ -142,10 +152,10 @@ sap.ui.define([
                     }
                 });
                 activeChanges = activeChanges.filter(change => !!change);
-                sendAction(changeStackModified({
-                    saved: this.savedChanges,
-                    pending: activeChanges
-                }));
+                if (Array.isArray(allCommands) && allCommands.length === 0) {
+                    await this.fetchSavedChanges();
+                }
+                this.updateStack(activeChanges);
             };
         }
         prepareChangeType(command, inactiveCommandCount, index) {

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

@@ -86,6 +86,7 @@ function modifyRTAErrorMessage(errorMessage: string, id: string, type: string):
  */
 export class ChangeService {
     private savedChanges: SavedPropertyChange[] = [];
+    private sendAction: (action: ExternalAction) => void;
     /**
      *
      * @param options ui5 adaptation options.
@@ -95,11 +96,13 @@ export class ChangeService {
     constructor(private readonly options: UI5AdaptationOptions, private readonly selectionService: SelectionService) {}
 
     /**
+     * Initializes change service.
      *
      * @param sendAction action sender function
      * @param subscribe subscriber function
      */
     public async init(sendAction: ActionSenderFunction, subscribe: SubscribeFunction): Promise<void> {
+        this.sendAction = sendAction;
         subscribe(async (action): Promise<void> => {
             if (changeProperty.match(action)) {
                 try {
@@ -127,6 +130,30 @@ export class ChangeService {
             }
         });
 
+        await this.fetchSavedChanges();
+        this.updateStack();
+
+        this.options.rta.attachUndoRedoStackModified(this.createOnStackChangeHandler());
+    }
+
+    /**
+     * Send update to the editor with modified stack.
+     *
+     * @param pendingChanges Changes that are waiting to be saved
+     */
+    private updateStack(pendingChanges: PendingChange[] = []) {
+        this.sendAction(
+            changeStackModified({
+                saved: this.savedChanges,
+                pending: pendingChanges
+            })
+        );
+    }
+
+    /**
+     * Fetches saved changes from the workspace and sorts them.
+     */
+    private async fetchSavedChanges(): Promise<void> {
         const savedChangesResponse = await fetch(FlexChangesEndPoints.changes + `?_=${Date.now()}`);
         const savedChanges = await savedChangesResponse.json();
         const changes = (
@@ -176,13 +203,6 @@ export class ChangeService {
                 .filter((change) => !!change) as SavedPropertyChange[]
         ).sort((a, b) => b.timestamp - a.timestamp);
         this.savedChanges = changes;
-        sendAction(
-            changeStackModified({
-                saved: changes,
-                pending: []
-            })
-        );
-        this.options.rta.attachUndoRedoStackModified(this.createOnStackChangeHandler(sendAction));
     }
 
     /**
@@ -209,16 +229,19 @@ export class ChangeService {
             );
 
         await Promise.all(filesToDelete).catch((error) => Log.error(error));
+
+        await this.fetchSavedChanges();
+        this.updateStack();
     }
 
     /**
      * Handler for undo/redo stack change.
      *
      * @param sendAction send action method
-     * @returns (event: sap.ui.base.Event) => void
+     * @returns (event: sap.ui.base.Event) => Promise<void>
      */
-    private createOnStackChangeHandler(sendAction: (action: ExternalAction) => void): (event: Event) => void {
-        return (): void => {
+    private createOnStackChangeHandler(): (event: Event) => Promise<void> {
+        return async (): Promise<void> => {
             const stack = this.options.rta.getCommandStack();
             const allCommands = stack.getCommands();
             const executedCommands = stack.getAllExecutedCommands();
@@ -240,12 +263,12 @@ export class ChangeService {
             });
 
             activeChanges = activeChanges.filter((change): boolean => !!change);
-            sendAction(
-                changeStackModified({
-                    saved: this.savedChanges,
-                    pending: activeChanges
-                })
-            );
+
+            if (Array.isArray(allCommands) && allCommands.length === 0) {
+                await this.fetchSavedChanges();
+            }
+
+            this.updateStack(activeChanges);
         };
     }
 

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.10.5",
+  "version": "0.10.7",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -24,7 +24,7 @@
   "dependencies": {
     "ejs": "3.1.9",
     "@sap-ux/logger": "0.4.0",
-    "@sap-ux/adp-tooling": "0.5.4",
+    "@sap-ux/adp-tooling": "0.5.5",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.4.2"
   },
   "devDependencies": {
@@ -36,9 +36,9 @@
     "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.7.3",
-    "@sap-ux/store": "0.4.0",
-    "@sap-ux/project-access": "1.15.1"
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.7.4",
+    "@sap-ux/project-access": "1.15.1",
+    "@sap-ux/store": "0.4.0"
   },
   "peerDependencies": {
     "express": "4"