🎨🐛 Enh/fix: frontend knows about trashedAt (#6717)

ITISFoundation · Nov 13, 2024 · e554ff4 · e554ff4
1 parent 2af7f21
commit e554ff4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/services/static-webserver/client/source/class/osparc/data/model/Folder.js b/services/static-webserver/client/source/class/osparc/data/model/Folder.js
@@ -37,6 +37,7 @@ qx.Class.define("osparc.data.model.Folder", {
       owner: folderData.owner,
       createdAt: new Date(folderData.createdAt),
       lastModified: new Date(folderData.modifiedAt),
+      trashedAt: folderData.trashedAt ? new Date(folderData.trashedAt) : this.getTrashedAt(),
     });
   },
 
@@ -95,7 +96,13 @@ qx.Class.define("osparc.data.model.Folder", {
       nullable: true,
       init: null,
       event: "changeLastModified"
-    }
+    },
+
+    trashedAt: {
+      check: "Date",
+      nullable: true,
+      init: null,
+    },
   },
 
   statics: {

diff --git a/services/static-webserver/client/source/class/osparc/data/model/Study.js b/services/static-webserver/client/source/class/osparc/data/model/Study.js
@@ -58,7 +58,8 @@ qx.Class.define("osparc.data.model.Study", {
       state: studyData.state || this.getState(),
       quality: studyData.quality || this.getQuality(),
       permalink: studyData.permalink || this.getPermalink(),
-      dev: studyData.dev || this.getDev()
+      dev: studyData.dev || this.getDev(),
+      trashedAt: studyData.trashedAt ? new Date(studyData.trashedAt) : this.getTrashedAt(),
     });
 
     const wbData = studyData.workbench || this.getWorkbench();
@@ -209,7 +210,13 @@ qx.Class.define("osparc.data.model.Study", {
       nullable: true,
       event: "changeReadOnly",
       init: true
-    }
+    },
+
+    trashedAt: {
+      check: "Date",
+      nullable: true,
+      init: null,
+    },
     // ------ ignore for serializing ------
   },
 
@@ -218,7 +225,8 @@ qx.Class.define("osparc.data.model.Study", {
       "permalink",
       "state",
       "pipelineRunning",
-      "readOnly"
+      "readOnly",
+      "trashedAt",
     ],
 
     IgnoreModelizationProps: [

diff --git a/services/static-webserver/client/source/class/osparc/store/Folders.js b/services/static-webserver/client/source/class/osparc/store/Folders.js
@@ -141,6 +141,8 @@ qx.Class.define("osparc.store.Folders", {
             folder.set("createdAt", new Date(folderData["createdAt"]));
           } else if (key === "modifiedAt") {
             folder.set("lastModified", new Date(folderData["modifiedAt"]));
+          } else if (key === "trashedAt") {
+            folder.set("trashedAt", new Date(folderData["trashedAt"]));
           } else {
             folder.set(key, folderData[key]);
           }