trashedAt in study cards

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/CardBase.js

@@ -308,6 +308,12 @@ qx.Class.define("osparc.dashboard.CardBase", {
       nullable: true
     },
 
+    trashedAt: {
+      check: "Date",
+      apply: "_applyTrasehdAt",
+      nullable: true
+    },
+
     classifiers: {
       check: "Array"
     },
@@ -457,6 +463,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
         owner,
         accessRights: resourceData.accessRights ? resourceData.accessRights : {},
         lastChangeDate: resourceData.lastChangeDate ? new Date(resourceData.lastChangeDate) : null,
+        trashedAt: resourceData.trashedAt ? new Date(resourceData.trashedAt) : null,
         icon: resourceData.thumbnail || this.self().PRODUCT_ICON,
         state: resourceData.state ? resourceData.state : {},
         classifiers: resourceData.classifiers && resourceData.classifiers ? resourceData.classifiers : [],
@@ -523,6 +530,10 @@ qx.Class.define("osparc.dashboard.CardBase", {
       throw new Error("Abstract method called!");
     },
 
+    _applyTrasehdAt: function(value, old) {
+      throw new Error("Abstract method called!");
+    },
+
     _applyAccessRights: function(value, old) {
       throw new Error("Abstract method called!");
     },

services/static-webserver/client/source/class/osparc/dashboard/GridButtonBase.js

@@ -251,7 +251,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
           layout.add(control, {flex: 1});
           break;
         }
-        case "modified-text":
+        case "date-text":
           control = new qx.ui.basic.Label().set({
             textColor: "contrasted-text-dark",
             alignY: "middle",

services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js

@@ -176,9 +176,21 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
 
     // overridden
     _applyLastChangeDate: function(value, old) {
-      if (value && (this.isResourceType("study") || this.isResourceType("template"))) {
-        const label = this.getChildControl("modified-text");
-        label.setValue(osparc.utils.Utils.formatDateAndTime(value));
+      if (value) {
+        if (this.isResourceType("study") || this.isResourceType("template")) {
+          const label = this.getChildControl("date-text");
+          label.setValue(osparc.utils.Utils.formatDateAndTime(value));
+        }
+      }
+    },
+
+    // overridden
+    _applyTrasehdAt: function(value, old) {
+      if (value && value.getTime() !== new Date(0).getTime()) {
+        if (this.isResourceType("study") || this.isResourceType("template")) {
+          const label = this.getChildControl("date-text");
+          label.setValue(osparc.utils.Utils.formatDateAndTime(value));
+        }
       }
     },
 

services/static-webserver/client/source/class/osparc/dashboard/ListButtonItem.js

@@ -68,7 +68,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
             column: osparc.dashboard.ListButtonBase.POS.SHARED
           });
           break;
-        case "last-change":
+        case "date-text":
           control = new qx.ui.basic.Label().set({
             anonymous: true,
             font: "text-13",
@@ -191,10 +191,23 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
       return control || this.base(arguments, id);
     },
 
+    // overridden
     _applyLastChangeDate: function(value, old) {
       if (value) {
-        const label = this.getChildControl("last-change");
-        label.setValue(osparc.utils.Utils.formatDateAndTime(value));
+        if (this.isResourceType("study") || this.isResourceType("template")) {
+          const label = this.getChildControl("date-text");
+          label.setValue(osparc.utils.Utils.formatDateAndTime(value));
+        }
+      }
+    },
+
+    // overridden
+    _applyTrasehdAt: function(value, old) {
+      if (value && value.getTime() !== new Date(0).getTime()) {
+        if (this.isResourceType("study") || this.isResourceType("template")) {
+          const label = this.getChildControl("date-text");
+          label.setValue(osparc.utils.Utils.formatDateAndTime(value));
+        }
       }
     },