[skip ci] don't listen to change value

odeimaiz · odeimaiz · commit 011f9de8661d · 2024-12-12T12:47:40.000+01:00
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js b/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
@@ -241,6 +241,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
       check: "Boolean",
       init: false,
       nullable: false,
+      event: "changeSelected",
     },
 
     icon: {
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js
@@ -33,7 +33,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
       appearance: "pb-study"
     });
 
-    this.addListener("changeValue", e => this.__itemSelected(e.getData()), this);
+    this.addListener("tap", e => this.__itemSelected(e.getData()), this);
 
     this.setPriority(osparc.dashboard.CardBase.CARD_PRIORITY.ITEM);
 
@@ -246,7 +246,6 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
       if (studyBrowserContext !== "trash" && newVal) {
         this.fireDataEvent("folderSelected", this.getFolderId());
       }
-      this.setValue(false);
     },
 
     __editFolder: function() {
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonNew.js b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonNew.js
@@ -30,7 +30,7 @@ qx.Class.define("osparc.dashboard.FolderButtonNew", {
       appearance: "pb-new"
     });
 
-    this.addListener("changeValue", e => this.__itemSelected(e.getData()), this);
+    this.addListener("tap", e => this.__itemSelected(e.getData()), this);
 
     this.setPriority(osparc.dashboard.CardBase.CARD_PRIORITY.NEW);
 
@@ -92,7 +92,6 @@ qx.Class.define("osparc.dashboard.FolderButtonNew", {
         });
         folderEditor.addListener("cancel", () => win.close());
       }
-      this.setValue(false);
     }
   }
 });
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js
@@ -32,7 +32,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
 
     this.setPriority(osparc.dashboard.CardBase.CARD_PRIORITY.ITEM);
 
-    this.addListener("changeValue", this.__itemSelected, this);
+    this.addListener("tap", this.__itemSelected, this);
   },
 
   statics: {
@@ -189,12 +189,12 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
 
     __itemSelected: function() {
       if (this.isItemNotClickable()) {
-        this.setValue(false);
+        this.setSelected(false);
         return;
       }
 
       if (this.isResourceType("study") && this.isMultiSelectionMode()) {
-        const selected = this.getValue();
+        const selected = this.getSelected();
 
         const tick = this.getChildControl("tick-selected");
         tick.setVisibility(selected ? "visible" : "excluded");
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/GridButtonLoadMore.js b/services/static-webserver/client/source/class/osparc/dashboard/GridButtonLoadMore.js
@@ -50,10 +50,6 @@ qx.Class.define("osparc.dashboard.GridButtonLoadMore", {
       this.setEnabled(!value);
     },
 
-    _onToggleChange: function(e) {
-      this.setValue(false);
-    },
-
     _shouldApplyFilter: function() {
       return false;
     },
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/GridButtonNew.js b/services/static-webserver/client/source/class/osparc/dashboard/GridButtonNew.js
@@ -67,10 +67,6 @@ qx.Class.define("osparc.dashboard.GridButtonNew", {
   },
 
   members: {
-    _onToggleChange: function(e) {
-      this.setValue(false);
-    },
-
     _shouldApplyFilter: function(data) {
       return false;
     },
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/GridButtonPlaceholder.js b/services/static-webserver/client/source/class/osparc/dashboard/GridButtonPlaceholder.js
@@ -23,9 +23,6 @@ qx.Class.define("osparc.dashboard.GridButtonPlaceholder", {
 
     this.setPriority(osparc.dashboard.CardBase.CARD_PRIORITY.PLACEHOLDER);
 
-    // make unselectable
-    this.addListener("changeValue", () => this.setValue(false), this);
-
     this.set({
       cursor: "not-allowed"
     });
@@ -122,10 +119,6 @@ qx.Class.define("osparc.dashboard.GridButtonPlaceholder", {
       return true;
     },
 
-    _onToggleChange: function() {
-      this.setValue(false);
-    },
-
     _shouldApplyFilter: function(data) {
       if (data.text) {
         const checks = [
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ListButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/ListButtonItem.js
@@ -29,7 +29,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
 
     this.setPriority(osparc.dashboard.CardBase.CARD_PRIORITY.ITEM);
 
-    this.addListener("changeValue", this.__itemSelected, this);
+    this.addListener("tap", this.__itemSelected, this);
   },
 
   statics: {
@@ -275,12 +275,12 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
 
     __itemSelected: function() {
       if (this.isItemNotClickable()) {
-        this.setValue(false);
+        this.setSelected(false);
         return;
       }
 
       if (this.isResourceType("study") && this.isMultiSelectionMode()) {
-        const selected = this.getValue();
+        const selected = this.getSelected();
 
         const tick = this.getChildControl("tick-selected");
         tick.setVisibility(selected ? "visible" : "excluded");
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ListButtonLoadMore.js b/services/static-webserver/client/source/class/osparc/dashboard/ListButtonLoadMore.js
@@ -49,10 +49,6 @@ qx.Class.define("osparc.dashboard.ListButtonLoadMore", {
       this.setEnabled(!value);
     },
 
-    _onToggleChange: function(e) {
-      this.setValue(false);
-    },
-
     _shouldApplyFilter: function() {
       return false;
     },
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ListButtonNew.js b/services/static-webserver/client/source/class/osparc/dashboard/ListButtonNew.js
@@ -51,10 +51,6 @@ qx.Class.define("osparc.dashboard.ListButtonNew", {
   },
 
   members: {
-    _onToggleChange: function(e) {
-      this.setValue(false);
-    },
-
     _shouldApplyFilter: function(data) {
       return false;
     },
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ListButtonPlaceholder.js b/services/static-webserver/client/source/class/osparc/dashboard/ListButtonPlaceholder.js
@@ -23,9 +23,6 @@ qx.Class.define("osparc.dashboard.ListButtonPlaceholder", {
 
     this.setPriority(osparc.dashboard.CardBase.CARD_PRIORITY.PLACEHOLDER);
 
-    // make unselectable
-    this.addListener("changeValue", () => this.setValue(false), this);
-
     this.__layout = this.getChildControl("progress-layout")
     this.set({
       appearance: "pb-new",
@@ -108,10 +105,6 @@ qx.Class.define("osparc.dashboard.ListButtonPlaceholder", {
       return true;
     },
 
-    _onToggleChange: function() {
-      this.setValue(false);
-    },
-
     _shouldApplyFilter: function(data) {
       if (data.text) {
         const checks = [
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
@@ -640,16 +640,16 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         card.setMultiSelectionMode(this.getMultiSelection());
         card.addListener("tap", e => {
           if (card.isItemNotClickable()) {
-            card.setValue(false);
+            card.setSelected(false);
           } else {
-            this.__itemClicked(card, e.getNativeEvent().shiftKey);
+            this.__studyCardClicked(card, e.getNativeEvent().shiftKey);
           }
         }, this);
         this._populateCardMenu(card);
       });
     },
 
-    __itemClicked: function(item, isShiftPressed) {
+    __studyCardClicked: function(item, isShiftPressed) {
       const studiesCont = this._resourcesContainer.getFlatList();
 
       if (isShiftPressed) {
@@ -659,13 +659,15 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         for (let i=minMax[0]; i<=minMax[1]; i++) {
           const card = studiesCont.getChildren()[i];
           if (card.isVisible()) {
-            card.setValue(true);
+            card.setSelected(true);
           }
         }
       }
       studiesCont.setLastSelectedIndex(studiesCont.getIndex(item));
 
-      if (!item.isMultiSelectionMode()) {
+      if (item.isMultiSelectionMode()) {
+        item.setSelected(true);
+      } else {
         const studyData = this.__getStudyData(item.getUuid(), false);
         this._openResourceDetails(studyData);
         this.resetSelection();
@@ -860,7 +862,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       newStudyBtn.setCardKey("new-study");
       newStudyBtn.subscribeToFilterGroup("searchBarFilter");
       osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn");
-      newStudyBtn.addListener("execute", () => this.__newStudyBtnClicked(newStudyBtn));
+      newStudyBtn.addListener("tap", () => this.__newStudyBtnClicked(newStudyBtn));
       this._resourcesContainer.addNonResourceCard(newStudyBtn);
     },
 
@@ -880,8 +882,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           if (product in newStudiesData) {
             newStudyBtn.setEnabled(true);
 
-            newStudyBtn.addListener("execute", () => {
-              newStudyBtn.setValue(false);
+            newStudyBtn.addListener("tap", () => {
               osparc.data.Resources.get("templates")
                 .then(templates => {
                   if (templates) {
@@ -930,7 +931,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
             const newStudyFromServiceButton = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title, desc) : new osparc.dashboard.ListButtonNew(title, desc);
             newStudyFromServiceButton.setCardKey("new-"+key);
             osparc.utils.Utils.setIdToWidget(newStudyFromServiceButton, newButtonInfo.idToWidget);
-            newStudyFromServiceButton.addListener("execute", () => this.__newStudyFromServiceBtnClicked(newStudyFromServiceButton, latestMetadata["key"], latestMetadata["version"], newButtonInfo.newStudyLabel));
+            newStudyFromServiceButton.addListener("tap", () => this.__newStudyFromServiceBtnClicked(newStudyFromServiceButton, latestMetadata["key"], latestMetadata["version"], newButtonInfo.newStudyLabel));
             this._resourcesContainer.addNonResourceCard(newStudyFromServiceButton);
           })
       }
@@ -1153,8 +1154,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       const loadMoreBtn = this._loadingResourcesBtn = (mode === "grid") ? new osparc.dashboard.GridButtonLoadMore() : new osparc.dashboard.ListButtonLoadMore();
       loadMoreBtn.setCardKey("load-more");
       osparc.utils.Utils.setIdToWidget(loadMoreBtn, "studiesLoading");
-      loadMoreBtn.addListener("execute", () => {
-        loadMoreBtn.setValue(false);
+      loadMoreBtn.addListener("tap", () => {
         this._moreResourcesRequired();
       });
       return loadMoreBtn;
@@ -1324,7 +1324,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         if (osparc.dashboard.ResourceBrowserBase.isCardButtonItem(studyItem)) {
           studyItem.setMultiSelectionMode(value);
           if (value === false) {
-            studyItem.setValue(false);
+            studyItem.setSelected(false);
           }
         }
       });
@@ -1347,7 +1347,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     __newStudyBtnClicked: function(button) {
-      button.setValue(false);
       const minStudyData = osparc.data.model.Study.createMinStudyObject();
       const existingNames = this._resourcesList.map(study => study["name"]);
       const title = osparc.utils.Utils.getUniqueName(minStudyData.name, existingNames);
@@ -1388,7 +1387,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     __newStudyFromServiceBtnClicked: function(button, key, version, newStudyLabel) {
-      button.setValue(false);
       this._showLoadingPage(this.tr("Creating ") + osparc.product.Utils.getStudyAlias());
       const contextProps = {
         workspaceId: this.getCurrentWorkspaceId(),
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js
@@ -125,7 +125,6 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
 
     __itemClicked: function(card) {
       if (!card.getBlocked()) {
-        card.setValue(false);
         const templateData = this.__getTemplateData(card.getUuid());
         this._openResourceDetails(templateData);
       }
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ToggleButtonContainer.js b/services/static-webserver/client/source/class/osparc/dashboard/ToggleButtonContainer.js
@@ -27,7 +27,8 @@ qx.Class.define("osparc.dashboard.ToggleButtonContainer", {
       // return (card instanceof qx.ui.form.ToggleButton);
       return (
         widget instanceof osparc.dashboard.CardBase ||
-        widget instanceof osparc.dashboard.FolderButtonBase
+        widget instanceof osparc.dashboard.FolderButtonBase ||
+        widget instanceof osparc.dashboard.WorkspaceButtonBase
       );
     },
   },
@@ -42,7 +43,7 @@ qx.Class.define("osparc.dashboard.ToggleButtonContainer", {
           return;
         }
         this.base(arguments, child, options);
-        child.addListener("changeValue", () => this.fireDataEvent("changeSelection", this.getSelection()), this);
+        child.addListener("changeSelected", () => this.fireDataEvent("changeSelection", this.getSelection()), this);
         child.addListener("changeVisibility", () => this.fireDataEvent("changeVisibility", this.__getVisibles()), this);
       } else {
         console.error("ToggleButtonContainer only allows ToggleButton as its children.");
@@ -53,7 +54,7 @@ qx.Class.define("osparc.dashboard.ToggleButtonContainer", {
      * Resets the selection so no toggle button is checked.
      */
     resetSelection: function() {
-      this.getChildren().map(button => button.setValue(false));
+      this.getChildren().map(button => button.setSelected(false));
       this.__lastSelectedIdx = null;
       this.fireDataEvent("changeSelection", this.getSelection());
     },
@@ -62,7 +63,7 @@ qx.Class.define("osparc.dashboard.ToggleButtonContainer", {
      * Returns an array that contains all buttons that are checked.
      */
     getSelection: function() {
-      return this.getChildren().filter(button => button.getValue());
+      return this.getChildren().filter(button => button.getSelected());
     },
 
     /**
@@ -73,12 +74,12 @@ qx.Class.define("osparc.dashboard.ToggleButtonContainer", {
     },
 
     /**
-     * Sets the given button's value to true (checks it) and unchecks all other buttons. If the given button is not present,
-     * every button in the container will get a false value (unchecked).
+     * Sets the given button's select prop to true (checks it) and unchecks all other buttons. If the given button is not present,
+     * every button in the container will get a unselected (unchecked).
      * @param {qx.ui.form.ToggleButton} child Button that will be checked
      */
     selectOne: function(child) {
-      this.getChildren().map(button => button.setValue(button === child));
+      this.getChildren().map(button => button.setSelected(button === child));
       this.setLastSelectedIndex(this.getIndex(child));
     },
 
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonBase.js b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonBase.js
@@ -16,22 +16,22 @@
 ************************************************************************ */
 
 qx.Class.define("osparc.dashboard.WorkspaceButtonBase", {
-  extend: qx.ui.form.ToggleButton,
+  extend: qx.ui.core.Widget,
   implement: [qx.ui.form.IModel, osparc.filter.IFilterable],
   include: [qx.ui.form.MModelProperty, osparc.filter.MFilterable],
   type: "abstract",
 
   construct: function() {
     this.base(arguments);
 
+    this._setLayout(new qx.ui.layout.Canvas());
+
     this.set({
       width: this.self().ITEM_WIDTH,
       height: this.self().ITEM_HEIGHT,
       padding: 0
     });
 
-    this._setLayout(new qx.ui.layout.Canvas());
-
     this.getChildControl("main-layout");
 
     [
@@ -51,6 +51,13 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonBase", {
       nullable: true
     },
 
+    icon: {
+      check: "String",
+      init: null,
+      nullable: true,
+      apply: "_applyIcon",
+    },
+
     resourceType: {
       check: ["workspace"],
       init: "workspace",
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js
@@ -33,7 +33,7 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", {
       appearance: "pb-listitem"
     });
 
-    this.addListener("changeValue", e => this.__itemSelected(e.getData()), this);
+    this.addListener("tap", e => this.__itemSelected(e.getData()), this);
 
     this.setPriority(osparc.dashboard.CardBase.CARD_PRIORITY.ITEM);
 
@@ -259,7 +259,6 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", {
       if (studyBrowserContext !== "trash" && newVal) {
         this.fireDataEvent("workspaceSelected", this.getWorkspaceId());
       }
-      this.setValue(false);
     },
 
     __openShareWith: function() {
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonNew.js b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonNew.js

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ qx.Class.define("osparc.dashboard.FolderButtonNew", {`
`30`	`30`	`appearance: "pb-new"`
`31`	`31`	`});`
`32`	`32`
`33`		`- this.addListener("changeValue", e => this.__itemSelected(e.getData()), this);`
	`33`	`+ this.addListener("tap", e => this.__itemSelected(e.getData()), this);`
`34`	`34`
`35`	`35`	`this.setPriority(osparc.dashboard.CardBase.CARD_PRIORITY.NEW);`
`36`	`36`
`@@ -92,7 +92,6 @@ qx.Class.define("osparc.dashboard.FolderButtonNew", {`
`92`	`92`	`});`
`93`	`93`	`folderEditor.addListener("cancel", () => win.close());`
`94`	`94`	`}`
`95`		`- this.setValue(false);`
`96`	`95`	`}`
`97`	`96`	`}`
`98`	`97`	`});`