Skip to content

Commit 3ee4c3f

Browse files
committed
trashed items are not selectable
1 parent bbce5c5 commit 3ee4c3f

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,14 @@ qx.Class.define("osparc.dashboard.CardBase", {
395395
return this.getResourceType() === resourceType;
396396
},
397397

398+
isItemNotClickable: function() {
399+
const studyBrowserContext = osparc.store.Store.getInstance().getStudyBrowserContext();
400+
return (
401+
this.getBlocked() === true || // It could be blocked by IN_USE or UNKNOWN_SERVICE
402+
(this.isResourceType("study") && (studyBrowserContext === "trash")) // It could a trashed study
403+
);
404+
},
405+
398406
__applyResourceData: function(resourceData) {
399407
let uuid = null;
400408
let owner = null;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
241241
},
242242

243243
__itemSelected: function(newVal) {
244-
if (newVal) {
244+
const studyBrowserContext = osparc.store.Store.getInstance().getStudyBrowserContext();
245+
// do not allow selecting workspace
246+
if (studyBrowserContext !== "trash" && newVal) {
245247
this.fireDataEvent("folderSelected", this.getFolderId());
246248
}
247249
this.setValue(false);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
188188
},
189189

190190
__itemSelected: function() {
191-
// It could be blocked by IN_USE or UNKNOWN_SERVICE
192-
if (this.getBlocked() === true) {
191+
if (this.isItemNotClickable()) {
193192
this.setValue(false);
194193
return;
195194
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,7 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
274274
},
275275

276276
__itemSelected: function() {
277-
// It could be blocked by IN_USE or UNKNOWN_SERVICE
278-
if (this.getBlocked() === true) {
277+
if (this.isItemNotClickable()) {
279278
this.setValue(false);
280279
return;
281280
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
655655
cards.forEach(card => {
656656
card.setMultiSelectionMode(this.getMultiSelection());
657657
card.addListener("tap", e => {
658-
if (card.getBlocked() === true) {
658+
if (card.isItemNotClickable()) {
659659
card.setValue(false);
660660
} else {
661661
this.__itemClicked(card, e.getNativeEvent().shiftKey);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", {
254254
},
255255

256256
__itemSelected: function(newVal) {
257-
if (newVal) {
257+
const studyBrowserContext = osparc.store.Store.getInstance().getStudyBrowserContext();
258+
// do not allow selecting workspace
259+
if (studyBrowserContext !== "trash" && newVal) {
258260
this.fireDataEvent("workspaceSelected", this.getWorkspaceId());
259261
}
260262
this.setValue(false);

0 commit comments

Comments
 (0)