From 31c769c32306df826d75dd1f50c4388461270b49 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 28 Oct 2024 14:05:16 +0100 Subject: [PATCH 1/3] close after cancel --- .../client/source/class/osparc/dashboard/StudyBrowser.js | 1 + 1 file changed, 1 insertion(+) 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 0b43298c923..84d24092f1d 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -504,6 +504,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }, this); } }); + moveFolderTo.addListener("cancel", () => win.close()); }, __moveFolderToWorkspace: function(folderId, destWorkspaceId) { From dfbd165d115c9ab2b5cd78c081ef73530acc1660 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 28 Oct 2024 14:08:28 +0100 Subject: [PATCH 2/3] fix: move to root folder --- .../client/source/class/osparc/dashboard/StudyBrowser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 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 84d24092f1d..5e07e2e2562 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -471,7 +471,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { _moveFolderToRequested: function(folderId) { const currentWorkspaceId = this.getCurrentWorkspaceId(); - const currentFolderId = this.getCurrentWorkspaceId(); + const currentFolderId = this.getCurrentFolderId(); const moveFolderTo = new osparc.dashboard.MoveResourceTo(currentWorkspaceId, currentFolderId); const title = this.tr("Move to..."); const win = osparc.ui.window.Window.popUpInWindow(moveFolderTo, title, 400, 400); @@ -1416,7 +1416,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { moveToButton["moveToButton"] = true; moveToButton.addListener("tap", () => { const currentWorkspaceId = this.getCurrentWorkspaceId(); - const currentFolderId = this.getCurrentWorkspaceId(); + const currentFolderId = this.getCurrentFolderId(); const moveStudyTo = new osparc.dashboard.MoveResourceTo(currentWorkspaceId, currentFolderId); const title = this.tr("Move to..."); const win = osparc.ui.window.Window.popUpInWindow(moveStudyTo, title, 400, 400); From 61243c6df0ee29ce1b8455a2d08042d312577684 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 28 Oct 2024 14:12:25 +0100 Subject: [PATCH 3/3] more verbose coming soon --- .../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 5e07e2e2562..91499e44ce7 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -481,7 +481,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { const destWorkspaceId = data["workspaceId"]; const destFolderId = data["folderId"]; if (destWorkspaceId !== currentWorkspaceId) { - const msg = this.tr("Coming soon"); + const msg = this.tr("Moving folders to Shared Workspaces are coming soon"); osparc.FlashMessenger.getInstance().logAs(msg, "WARNING"); return; }