From dbb981876c88c6e27d0e316b25a80fcfe27df50f Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Wed, 18 Dec 2024 12:19:33 +0100 Subject: [PATCH 1/3] [skip ci] more renaming --- .../source/class/osparc/dashboard/StudyBrowser.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 397f2682acb..82f47d1b036 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -576,7 +576,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { const data = e.getData(); const destWorkspaceId = data["workspaceId"]; const destFolderId = data["folderId"]; - this._folderToFolderRequested(folderId, currentWorkspaceId, destWorkspaceId, destFolderId); + this.__folderToFolderRequested(folderId, currentWorkspaceId, destWorkspaceId, destFolderId); }); moveFolderTo.addListener("cancel", () => win.close()); }, @@ -591,7 +591,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }); }, - _folderToFolderRequested: function(folderId, workspaceId, destWorkspaceId, destFolderId) { + __folderToFolderRequested: function(folderId, workspaceId, destWorkspaceId, destFolderId) { if (destWorkspaceId === workspaceId) { this.__doMoveFolder(folderId, destWorkspaceId, destFolderId); } else { @@ -1183,7 +1183,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { destWorkspaceId, destFolderId, } = e.getData(); - this._moveStudyToFolderReqested(studyData, destWorkspaceId, destFolderId); + this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId); }); workspacesAndFoldersTree.addListener("folderToFolderRequested", e => { const { @@ -1192,7 +1192,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { destWorkspaceId, destFolderId, } = e.getData(); - this._folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId); + this.__folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId); }); this._resourceFilter.addListener("trashStudyRequested", e => { @@ -1686,7 +1686,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }); }, - _moveStudyToFolderReqested: function(studyData, destWorkspaceId, destFolderId) { + __studyToFolderRequested: function(studyData, destWorkspaceId, destFolderId) { if (studyData["workspaceId"] === destWorkspaceId) { this.__doMoveStudy(studyData, destWorkspaceId, destFolderId); } else { @@ -1713,7 +1713,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { const data = e.getData(); const destWorkspaceId = data["workspaceId"]; const destFolderId = data["folderId"]; - this._moveStudyToFolderReqested(studyData, destWorkspaceId, destFolderId); + this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId); }, this); moveStudyTo.addListener("cancel", () => win.close()); }, this); From 3390970e3b924c77fd75f10b1fb7ff345c0c1aea Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Wed, 18 Dec 2024 12:23:03 +0100 Subject: [PATCH 2/3] fix drop --- .../class/osparc/dashboard/StudyBrowser.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 82f47d1b036..c03f2b5a8ac 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -1203,6 +1203,25 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }); }, + _studyToFolderRequested: function(data) { + const { + studyData, + destWorkspaceId, + destFolderId, + } = data; + this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId); + }, + + _folderToFolderRequested: function(data) { + const { + folderId, + workspaceId, + destWorkspaceId, + destFolderId, + } = data; + this.__folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId); + }, + __addSortByButton: function() { const sortByButton = new osparc.dashboard.SortedByMenuButton(); sortByButton.set({ From a01ba9a16ffa9a2a44dc2280cefeb1fc372daa33 Mon Sep 17 00:00:00 2001 From: odeimaiz Date: Wed, 18 Dec 2024 13:50:36 +0100 Subject: [PATCH 3/3] minor --- .../client/source/class/osparc/dashboard/StudyBrowser.js | 6 ++++-- 1 file changed, 4 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 c03f2b5a8ac..084eff89572 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js @@ -1196,10 +1196,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", { }); this._resourceFilter.addListener("trashStudyRequested", e => { - this.__trashStudyRequested(e.getData()); + const studyData = e.getData(); + this.__trashStudyRequested(studyData); }); this._resourceFilter.addListener("trashFolderRequested", e => { - this._trashFolderRequested(e.getData()); + const folderId = e.getData(); + this._trashFolderRequested(folderId); }); },