🎨 [Frontend] UX: Disable Delete button (#8082)

Author: odeimaiz

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

@@ -1064,7 +1064,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
 
     openData: function() {
       const resourceData = this.getResourceData();
-      osparc.widget.StudyDataManager.popUpInWindow(resourceData["uuid"]);
+      osparc.widget.StudyDataManager.popUpInWindow(resourceData);
     },
 
     openBilling: function() {

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

@@ -924,7 +924,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
           gap: 14,
           cursor: "pointer",
         });
-        dataAccess.addListener("tap", () => osparc.widget.StudyDataManager.popUpInWindow(resourceData["uuid"], null, title));
+        dataAccess.addListener("tap", () => osparc.widget.StudyDataManager.popUpInWindow(resourceData, null, title));
         this.addWidgetToTabs(dataAccess);
 
         if (resourceData["resourceType"] === "study") {

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

@@ -55,7 +55,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
     },
 
     openNodeDataManager: function(node) {
-      const win = osparc.widget.StudyDataManager.popUpInWindow(node.getStudy().getUuid(), node.getNodeId(), node.getLabel());
+      const win = osparc.widget.StudyDataManager.popUpInWindow(node.getStudy().serialize(), node.getNodeId(), node.getLabel());
       const closeBtn = win.getChildControl("close-button");
       osparc.utils.Utils.setIdToWidget(closeBtn, "nodeDataManagerCloseBtn");
     }

services/static-webserver/client/source/class/osparc/file/FileLabelWithActions.js

@@ -65,6 +65,13 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
       event: "changeMultiSelect",
       apply: "__changeMultiSelection",
     },
+
+    deleteEnabled: {
+      check: "Boolean",
+      init: true,
+      nullable: true,
+      apply: "__applyDeleteEnabled",
+    },
   },
 
   members: {
@@ -106,11 +113,17 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
       }
     },
 
+    __applyDeleteEnabled: function(value) {
+      if (value === false) {
+        this.getChildControl("delete-button").setEnabled(false);
+      }
+    },
+
     setItemSelected: function(selectedItem) {
       if (selectedItem) {
         this.__selection = [selectedItem];
-        this.getChildControl("download-button").setEnabled(true); // folders can also be downloaded
-        this.getChildControl("delete-button").setEnabled(true); // folders can also be deleted
+        this.getChildControl("download-button").setEnabled(true);
+        this.getChildControl("delete-button").setEnabled(this.isDeleteEnabled());
         this.getChildControl("selected-label").setValue(selectedItem.getLabel());
       } else {
         this.resetSelection();
@@ -136,7 +149,7 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
     resetSelection: function() {
       this.__selection = [];
       this.getChildControl("download-button").setEnabled(false);
-      this.getChildControl("delete-button").setEnabled(false);
+      this.getChildControl("delete-button").setEnabled(this.isDeleteEnabled());
       this.getChildControl("selected-label").resetValue();
     },
 

services/static-webserver/client/source/class/osparc/share/NewCollaboratorsManager.js

@@ -19,7 +19,7 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
       showMaximize: false,
       autoDestroy: true,
       modal: true,
-      width: 330,
+      width: 430,
       maxHeight: 500,
       clickAwayClose: true
     });
@@ -76,9 +76,9 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
       switch (id) {
         case "intro-text": {
           let text = this.__showOrganizations ?
-            this.tr("Select users or organizations from the list below.") :
-            this.tr("Select users from the list below.");
-          text += this.tr("<br>Search them if they aren't listed.");
+            this.tr("Select organizations or users from the list or search by name, username or email.") :
+            this.tr("Select users from the list or search by name, username or email.");
+          text += "<br>" + this.tr("Keep in mind that users are only searchable based on the information they've chosen to make visible. To make yourself easier to find, adjust your visibility settings in My Account → Privacy.");
           control = new qx.ui.basic.Label().set({
             value: text,
             rich: true,

services/static-webserver/client/source/class/osparc/widget/StudyDataManager.js

@@ -34,15 +34,15 @@ qx.Class.define("osparc.widget.StudyDataManager", {
   extend: qx.ui.core.Widget,
 
   /**
-    * @param studyId {String} StudyId
+    * @param studyData {Object} Study Data
     * @param nodeId {String} NodeId
     */
-  construct: function(studyId, nodeId) {
+  construct: function(studyData, nodeId) {
     this.base(arguments);
 
     this._setLayout(new qx.ui.layout.VBox(10));
 
-    this.setStudyId(studyId);
+    this.setStudyData(studyData);
 
     if (nodeId) {
       this.setNodeId(nodeId);
@@ -53,8 +53,8 @@ qx.Class.define("osparc.widget.StudyDataManager", {
   },
 
   statics: {
-    popUpInWindow: function(studyId, nodeId, title) {
-      const studyDataManager = new osparc.widget.StudyDataManager(studyId, nodeId);
+    popUpInWindow: function(studyData, nodeId, title) {
+      const studyDataManager = new osparc.widget.StudyDataManager(studyData, nodeId);
       if (!title) {
         title = osparc.product.Utils.getStudyAlias({firstUpperCase: true}) + qx.locale.Manager.tr(" Files");
       }
@@ -63,8 +63,8 @@ qx.Class.define("osparc.widget.StudyDataManager", {
   },
 
   properties: {
-    studyId: {
-      check: "String",
+    studyData: {
+      check: "Object",
       init: null,
       nullable: false
     },
@@ -82,6 +82,10 @@ qx.Class.define("osparc.widget.StudyDataManager", {
       switch (id) {
         case "tree-folder-view":
           control = new osparc.file.TreeFolderView();
+          control
+            .getChildControl("folder-viewer")
+            .getChildControl("selected-file-layout")
+            .setDeleteEnabled(osparc.data.model.Study.canIDelete(this.getStudyData()["accessRights"]));
           this._add(control, {
             flex: 1
           });
@@ -102,14 +106,15 @@ qx.Class.define("osparc.widget.StudyDataManager", {
     __reloadTree: function() {
       const treeFolderView = this.getChildControl("tree-folder-view");
 
+      const studyId = this.getStudyData()["uuid"];
       const foldersTree = treeFolderView.getChildControl("folder-tree");
       foldersTree.resetCache();
       if (this.getNodeId()) {
-        foldersTree.populateNodeTree(this.getStudyId(), this.getNodeId());
-        treeFolderView.requestSize(this.getStudyId(), this.getNodeId());
-      } else if (this.getStudyId()) {
-        foldersTree.populateStudyTree(this.getStudyId());
-        treeFolderView.requestSize(this.getStudyId());
+        foldersTree.populateNodeTree(studyId, this.getNodeId());
+        treeFolderView.requestSize(studyId, this.getNodeId());
+      } else if (studyId) {
+        foldersTree.populateStudyTree(studyId);
+        treeFolderView.requestSize(studyId);
       }
 
       const folderViewer = treeFolderView.getChildControl("folder-viewer");