Merge branch 'master' into enh/second-app-for-s4l-lite

Author: mergify[bot]

services/static-webserver/client/source/class/osparc/data/model/Study.js

@@ -699,8 +699,9 @@ qx.Class.define("osparc.data.model.Study", {
     /**
      * Call patch Study, but the changes were already applied on the frontend
      * @param studyDiffs {Object} Diff Object coming from the JsonDiffPatch lib. Use only the keys, not the changes.
+     * @param sourceStudy {Object} Study object that was used to apply the diffs on the frontend.
      */
-    patchStudyDelayed: function(studyDiffs) {
+    patchStudyDelayed: function(studyDiffs, sourceStudy) {
       const promises = [];
       let workbenchDiffs = {};
       if ("workbench" in studyDiffs) {
@@ -730,12 +731,7 @@ qx.Class.define("osparc.data.model.Study", {
       }
       return Promise.all(promises)
         .then(() => {
-          // A bit hacky, but it's not sent back to the backend
-          this.set({
-            lastChangeDate: new Date()
-          });
-          const studyData = this.serialize();
-          return studyData;
+          return sourceStudy;
         });
     }
   }

services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js

@@ -857,20 +857,26 @@ qx.Class.define("osparc.desktop.StudyEditor", {
     },
 
     __getStudyDiffs: function() {
-      const newObj = this.getStudy().serialize();
-      const delta = osparc.wrapper.JsonDiffPatch.getInstance().diff(this.__studyDataInBackend, newObj);
+      const sourceStudy = this.getStudy().serialize();
+      const delta = osparc.wrapper.JsonDiffPatch.getInstance().diff(this.__studyDataInBackend, sourceStudy);
       if (delta) {
         // lastChangeDate and creationDate should not be taken into account as data change
         delete delta["creationDate"];
         delete delta["lastChangeDate"];
-        return delta;
+        return {
+          sourceStudy,
+          delta,
+        };
       }
-      return {};
+      return {
+        sourceStudy,
+        delta: {},
+      };
     },
 
     didStudyChange: function() {
       const studyDiffs = this.__getStudyDiffs();
-      return Boolean(Object.keys(studyDiffs).length);
+      return Boolean(Object.keys(studyDiffs.delta).length);
     },
 
     __checkStudyChanges: function() {
@@ -893,7 +899,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
 
       this.__updatingStudy++;
       const studyDiffs = this.__getStudyDiffs();
-      return this.getStudy().patchStudyDelayed(studyDiffs)
+      return this.getStudy().patchStudyDelayed(studyDiffs.delta, studyDiffs.sourceStudy)
         .then(studyData => this.__setStudyDataInBackend(studyData))
         .catch(error => {
           if ("status" in error && error.status === 409) {