From 56fa8810684e7837170f2ce979b3188718f16e7f Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Mon, 13 Jan 2025 11:58:19 +0100 Subject: [PATCH 1/8] trash icon --- .../client/source/class/osparc/dashboard/ResourceFilter.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js index 47bc72e9468..515f823f9dd 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js @@ -106,7 +106,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", { value: false, appearance: "filter-toggle-button", label: this.tr("Trash"), - icon: "@FontAwesome5Solid/trash/16", paddingLeft: 10, // align it with the context }); trashButton.addListener("changeValue", e => { @@ -198,7 +197,7 @@ qx.Class.define("osparc.dashboard.ResourceFilter", { setTrashEmpty: function(isEmpty) { this.__trashButton.set({ - textColor: isEmpty ? "text" : "danger-red" + icon: isEmpty ? "@FontAwesome5Solid/trash/16" : "@FontAwesome5Solid/trash-alt/16" }); }, /* /TRASH BIN */ From 1ed0135a5e9b36390cc341dd12eded0cab9aba40 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Mon, 13 Jan 2025 13:41:23 +0100 Subject: [PATCH 2/8] Trash -> Bin --- .../osparc/dashboard/FolderButtonItem.js | 2 +- .../class/osparc/dashboard/ResourceFilter.js | 2 +- .../class/osparc/dashboard/StudyBrowser.js | 31 ++++++++++--------- .../osparc/dashboard/StudyBrowserHeader.js | 8 ++--- .../osparc/dashboard/WorkspaceButtonItem.js | 8 ++--- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js index f496b14501a..eea72c176ef 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js @@ -271,7 +271,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", { menu.addSeparator(); - const trashButton = new qx.ui.menu.Button(this.tr("Trash"), "@FontAwesome5Solid/trash/12"); + const trashButton = new qx.ui.menu.Button(this.tr("Move to Bin"), "@FontAwesome5Solid/trash/12"); trashButton.addListener("execute", () => this.fireDataEvent("trashFolderRequested", this.getFolderId()), this); menu.add(trashButton); } else if (studyBrowserContext === "trash") { diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js index 515f823f9dd..cd0339f00bb 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js @@ -105,7 +105,7 @@ qx.Class.define("osparc.dashboard.ResourceFilter", { const trashButton = this.__trashButton = new qx.ui.toolbar.RadioButton().set({ value: false, appearance: "filter-toggle-button", - label: this.tr("Trash"), + label: this.tr("Bin"), paddingLeft: 10, // align it with the context }); trashButton.addListener("changeValue", e => { diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js index 084eff89572..d3c15fd032e 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -470,7 +470,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { osparc.store.Workspaces.getInstance().trashWorkspace(workspaceId) .then(() => { this.__reloadWorkspaces(); - const msg = this.tr("Successfully moved to Trash"); + const msg = this.tr("Successfully moved to the Bin"); osparc.FlashMessenger.getInstance().logAs(msg, "INFO"); this._resourceFilter.setTrashEmpty(false); }) @@ -608,7 +608,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { osparc.store.Folders.getInstance().trashFolder(folderId, this.getCurrentWorkspaceId()) .then(() => { this.__reloadFolders(); - const msg = this.tr("Successfully moved to Trash"); + const msg = this.tr("Successfully moved to Bin"); osparc.FlashMessenger.getInstance().logAs(msg, "INFO"); this._resourceFilter.setTrashEmpty(false); }) @@ -620,11 +620,11 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { _trashFolderRequested: function(folderId) { const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays(); - let msg = this.tr("Are you sure you want to move the Folder and all its content to the trash?"); + let msg = this.tr("Are you sure you want to move the Folder and all its content to the Bin?"); msg += "

" + this.tr("It will be permanently deleted after ") + trashDays + " days."; const confirmationWin = new osparc.ui.window.Confirmation(msg).set({ - caption: this.tr("Move to Trash"), - confirmText: this.tr("Move to Trash"), + caption: this.tr("Move to Bin"), + confirmText: this.tr("Move to Bin"), confirmAction: "warning", }); confirmationWin.center(); @@ -764,6 +764,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { // loose equality: will do a Number to String conversion if necessary sameContext &= key in currentParams && currentParams[key] == value; }); + console.log("sameContext", sameContext, reqParams, currentParams); return !sameContext; }, @@ -1051,17 +1052,17 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { studiesMoveButton.set({ visibility: selection.length && currentContext === "studiesAndFolders" ? "visible" : "excluded", - label: selection.length > 1 ? this.tr("Move selected")+" ("+selection.length+")" : this.tr("Move") + label: this.tr("Move") + (selection.length > 1 ? this.tr(" selected ") + `(${selection.length})` : ""), }); studiesTrashButton.set({ visibility: selection.length && currentContext === "studiesAndFolders" ? "visible" : "excluded", - label: selection.length > 1 ? this.tr("Trash selected")+" ("+selection.length+")" : this.tr("Trash") + label: this.tr("Move to Bin") + (selection.length > 1 ? this.tr(" selected ") + `(${selection.length})` : ""), }); studiesDeleteButton.set({ visibility: selection.length && currentContext === "trash" ? "visible" : "excluded", - label: selection.length > 1 ? this.tr("Delete selected")+" ("+selection.length+")" : this.tr("Delete") + label: this.tr("Delete permamently") + (selection.length > 1 ? this.tr(" selected ") + `(${selection.length})` : ""), }); }); @@ -1320,8 +1321,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }, __createTrashStudiesButton: function() { - const trashButton = new qx.ui.form.Button(this.tr("Trash"), "@FontAwesome5Solid/trash/14").set({ - appearance: "danger-button", + const trashButton = new qx.ui.form.Button(this.tr("Move to Bin"), "@FontAwesome5Solid/trash/14").set({ + appearance: "warning-button", visibility: "excluded" }); osparc.utils.Utils.setIdToWidget(trashButton, "deleteStudiesBtn"); @@ -1828,7 +1829,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }, __getTrashStudyMenuButton: function(studyData) { - const trashButton = new qx.ui.menu.Button(this.tr("Trash"), "@FontAwesome5Solid/trash/12"); + const trashButton = new qx.ui.menu.Button(this.tr("Move to Bin"), "@FontAwesome5Solid/trash/12"); trashButton["trashButton"] = true; trashButton.set({ appearance: "menu-button" @@ -2029,7 +2030,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { osparc.store.Store.getInstance().trashStudy(studyData.uuid) .then(() => { this.__removeFromStudyList(studyData.uuid); - const msg = this.tr("Successfully moved to Trash"); + const msg = this.tr("Successfully moved to Bin"); osparc.FlashMessenger.getInstance().logAs(msg, "INFO"); this._resourceFilter.setTrashEmpty(false); }) @@ -2089,12 +2090,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { } else { msg += ` '${studyNames[0]}' `; } - msg += this.tr("to the Trash?"); + msg += this.tr("to the Bin?"); const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays(); msg += "

" + (studyNames.length > 1 ? "They" : "It") + this.tr(` will be permanently deleted after ${trashDays} days.`); const confirmationWin = new osparc.ui.window.Confirmation(msg).set({ - caption: this.tr("Move to Trash"), - confirmText: this.tr("Move to Trash"), + caption: this.tr("Move to Bin"), + confirmText: this.tr("Move to Bin"), confirmAction: "warning", }); osparc.utils.Utils.setIdToWidget(confirmationWin.getConfirmButton(), "confirmDeleteStudyBtn"); diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js index cb2e130cfcf..96d6a1a795a 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js @@ -193,7 +193,7 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", { break; } case "empty-trash-button": { - control = new qx.ui.form.Button(this.tr("Empty Trash"), "@FontAwesome5Solid/trash/14").set({ + control = new qx.ui.form.Button(this.tr("Empty Bin"), "@FontAwesome5Solid/trash/14").set({ appearance: "danger-button", allowGrowY: false, alignY: "middle", @@ -233,7 +233,7 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", { const roleWorkspaceLayout = this.getChildControl("role-layout").set({ visibility: "excluded" }); - + const description = this.getChildControl("description").set({ visibility: "excluded" }); @@ -275,10 +275,10 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", { break; case "trash": { this.__setIcon("@FontAwesome5Solid/trash/20"); - title.setValue(this.tr("Trash")); + title.setValue(this.tr("Bin")); const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays(); description.set({ - value: this.tr(`Items in the bin will be permanently deleted after ${trashDays} days.`), + value: this.tr(`Items in the Bin will be permanently deleted after ${trashDays} days.`), visibility: "visible", }); break; diff --git a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js index 91ab3a26233..975766d0a88 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js @@ -210,7 +210,7 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", { menu.addSeparator(); - const trashButton = new qx.ui.menu.Button(this.tr("Trash"), "@FontAwesome5Solid/trash/12"); + const trashButton = new qx.ui.menu.Button(this.tr("Move to Bin"), "@FontAwesome5Solid/trash/12"); trashButton.addListener("execute", () => this.__trashWorkspaceRequested(), this); menu.add(trashButton); } else if (studyBrowserContext === "trash") { @@ -270,11 +270,11 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", { __trashWorkspaceRequested: function() { const trashDays = osparc.store.StaticInfo.getInstance().getTrashRetentionDays(); - let msg = this.tr("Are you sure you want to move the Workspace and all its content to the trash?"); + let msg = this.tr("Are you sure you want to move the Workspace and all its content to the Bin?"); msg += "

" + this.tr("It will be permanently deleted after ") + trashDays + " days."; const confirmationWin = new osparc.ui.window.Confirmation(msg).set({ - caption: this.tr("Move to Trash"), - confirmText: this.tr("Move to Trash"), + caption: this.tr("Move to Bin"), + confirmText: this.tr("Move to Bin"), confirmAction: "delete" }); confirmationWin.center(); From 3e9c34cc92161643370154450449017d07b25052 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Mon, 13 Jan 2025 13:43:46 +0100 Subject: [PATCH 3/8] Delete -> Delete permanently --- .../source/class/osparc/dashboard/FolderButtonItem.js | 2 +- .../client/source/class/osparc/dashboard/StudyBrowser.js | 8 ++++---- .../source/class/osparc/dashboard/WorkspaceButtonItem.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js index eea72c176ef..bfbdc147fc5 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/FolderButtonItem.js @@ -329,7 +329,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", { const msg = this.tr("Are you sure you want to delete") + " " + this.getTitle() + "?"; const confirmationWin = new osparc.ui.window.Confirmation(msg).set({ caption: this.tr("Delete Folder"), - confirmText: this.tr("Delete"), + confirmText: this.tr("Delete permanently"), confirmAction: "delete" }); osparc.utils.Utils.setIdToWidget(confirmationWin.getConfirmButton(), "confirmDeleteFolderButton"); diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js index d3c15fd032e..4e36b41b660 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -1346,7 +1346,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }, __createDeleteStudiesButton: function() { - const deleteButton = new qx.ui.form.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/14").set({ + const deleteButton = new qx.ui.form.Button(this.tr("Delete permanently"), "@FontAwesome5Solid/trash/14").set({ appearance: "danger-button", visibility: "excluded" }); @@ -1850,7 +1850,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }, __getDeleteStudyMenuButton: function(studyData) { - const deleteButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12"); + const deleteButton = new qx.ui.menu.Button(this.tr("Delete permanently"), "@FontAwesome5Solid/trash/12"); deleteButton["deleteButton"] = true; deleteButton.set({ appearance: "menu-button" @@ -2119,7 +2119,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { msg += (studyNames.length > 1 ? ` ${studyNames.length} ${studyAlias}?` : ` ${studyNames[0]}?`); const confirmationWin = new osparc.ui.window.Confirmation(msg).set({ caption: this.tr("Delete") + " " + studyAlias, - confirmText: this.tr("Delete"), + confirmText: this.tr("Delete permanently"), confirmAction: "delete" }); osparc.utils.Utils.setIdToWidget(confirmationWin.getConfirmButton(), "confirmDeleteStudyBtn"); @@ -2130,7 +2130,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { const msg = this.tr("Items in the bin will be permanently deleted"); const confirmationWin = new osparc.ui.window.Confirmation(msg).set({ caption: this.tr("Delete"), - confirmText: this.tr("Delete forever"), + confirmText: this.tr("Delete permanently"), confirmAction: "delete" }); return confirmationWin; diff --git a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js index 975766d0a88..7b720ee09f1 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceButtonItem.js @@ -220,7 +220,7 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", { menu.addSeparator(); - const deleteButton = new qx.ui.menu.Button(this.tr("Delete"), "@FontAwesome5Solid/trash/12"); + const deleteButton = new qx.ui.menu.Button(this.tr("Delete permanently"), "@FontAwesome5Solid/trash/12"); osparc.utils.Utils.setIdToWidget(deleteButton, "deleteWorkspaceMenuItem"); deleteButton.addListener("execute", () => this.__deleteWorkspaceRequested(), this); menu.add(deleteButton); @@ -291,7 +291,7 @@ qx.Class.define("osparc.dashboard.WorkspaceButtonItem", { msg += "
" + this.tr("All the content of the workspace will be deleted."); const confirmationWin = new osparc.ui.window.Confirmation(msg).set({ caption: this.tr("Delete Workspace"), - confirmText: this.tr("Delete"), + confirmText: this.tr("Delete permanently"), confirmAction: "delete" }); osparc.utils.Utils.setIdToWidget(confirmationWin.getConfirmButton(), "confirmDeleteWorkspaceButton"); From 90c9f4d98c034ae07c4cc22c5c92fd5e1a5e79e9 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Mon, 13 Jan 2025 13:44:50 +0100 Subject: [PATCH 4/8] minor --- .../client/source/class/osparc/dashboard/StudyBrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js index 4e36b41b660..73a251bc832 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -470,7 +470,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { osparc.store.Workspaces.getInstance().trashWorkspace(workspaceId) .then(() => { this.__reloadWorkspaces(); - const msg = this.tr("Successfully moved to the Bin"); + const msg = this.tr("Successfully moved to Bin"); osparc.FlashMessenger.getInstance().logAs(msg, "INFO"); this._resourceFilter.setTrashEmpty(false); }) From 5c89ba7e4a355b91eead65a77a8aa395d4cee9e9 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Mon, 13 Jan 2025 14:08:21 +0100 Subject: [PATCH 5/8] minor --- .../client/source/class/osparc/dashboard/ResourceFilter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js index cd0339f00bb..2ba5ebd4d59 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js @@ -197,7 +197,7 @@ qx.Class.define("osparc.dashboard.ResourceFilter", { setTrashEmpty: function(isEmpty) { this.__trashButton.set({ - icon: isEmpty ? "@FontAwesome5Solid/trash/16" : "@FontAwesome5Solid/trash-alt/16" + icon: isEmpty ? "@FontAwesome5Solid/trash-alt/16" : "@FontAwesome5Solid/trash/16" }); }, /* /TRASH BIN */ From aa41c1eaafdbecb9ed87967ba549718d915185fd Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Mon, 13 Jan 2025 14:34:14 +0100 Subject: [PATCH 6/8] fix trash paging --- .../client/source/class/osparc/dashboard/StudyBrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js index 73a251bc832..d65ec9c0d8b 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -745,6 +745,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { delete reqParams["type"]; delete reqParams["limit"]; delete reqParams["offset"]; + delete reqParams["filters"]; const cParams = this.__getRequestParams(); const currentParams = {}; @@ -764,7 +765,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { // loose equality: will do a Number to String conversion if necessary sameContext &= key in currentParams && currentParams[key] == value; }); - console.log("sameContext", sameContext, reqParams, currentParams); return !sameContext; }, From 5e3e8b5589fe2599c8edb5f464f3f8add036c103 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Mon, 13 Jan 2025 14:43:12 +0100 Subject: [PATCH 7/8] minor --- .../client/source/class/osparc/dashboard/ResourceFilter.js | 1 + 1 file changed, 1 insertion(+) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js index 2ba5ebd4d59..c9aa77b74eb 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js @@ -106,6 +106,7 @@ qx.Class.define("osparc.dashboard.ResourceFilter", { value: false, appearance: "filter-toggle-button", label: this.tr("Bin"), + icon: "@FontAwesome5Solid/trash-alt/16", paddingLeft: 10, // align it with the context }); trashButton.addListener("changeValue", e => { From f2e32ba117ff7d6517d1bcb6e10c82d1f940bbd7 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Mon, 13 Jan 2025 16:14:08 +0100 Subject: [PATCH 8/8] Empty bin Not yet implemented --- .../client/source/class/osparc/dashboard/StudyBrowser.js | 9 ++++++--- .../source/class/osparc/dashboard/StudyBrowserHeader.js | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js index d65ec9c0d8b..a3dfabaf46e 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -197,7 +197,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { this.__setWorkspacesToList(workspaces); if (this.getCurrentContext() === "trash") { if (workspaces.length) { - this.__header.getChildControl("empty-trash-button").show(); + // Not yet implemented + // this.__header.getChildControl("empty-trash-button").show(); } } }) @@ -243,7 +244,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { this.__setFoldersToList(folders); if (this.getCurrentContext() === "trash") { if (folders.length) { - this.__header.getChildControl("empty-trash-button").show(); + // Not yet implemented + // this.__header.getChildControl("empty-trash-button").show(); } } }) @@ -311,7 +313,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { if (this.getCurrentContext() === "trash") { if (this._resourcesList.length) { - this.__header.getChildControl("empty-trash-button").show(); + // Not yet implemented + // this.__header.getChildControl("empty-trash-button").show(); } } diff --git a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js index 96d6a1a795a..afe3d47bd95 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js @@ -197,6 +197,7 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", { appearance: "danger-button", allowGrowY: false, alignY: "middle", + visibility: "excluded", // Not yet implemented }); control.addListener("execute", () => this.fireEvent("emptyTrashRequested")); this._addAt(control, this.self().POS.EMPTY_TRASH_BUTTON);