Skip to content

🐛 [Frontend] Fix: Drop on folder card #6977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 7, 2025
Merged

🐛 [Frontend] Fix: Drop on folder card #6977

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dbb9818
[skip ci] more renaming
odeimaiz Dec 18, 2024
3390970
fix drop
odeimaiz Dec 18, 2024
f1f1d8d
Merge branch 'master' into fix/drop-on-folder
odeimaiz Dec 18, 2024
a01ba9a
minor
odeimaiz Dec 18, 2024
6b612b6
Merge branch 'fix/drop-on-folder' of github.com:odeimaiz/osparc-simco…
odeimaiz Dec 18, 2024
bbc316f
Merge branch 'master' into fix/drop-on-folder
odeimaiz Dec 18, 2024
69b3f0f
Merge branch 'master' into fix/drop-on-folder
odeimaiz Dec 27, 2024
e61178a
Merge branch 'master' into fix/drop-on-folder
odeimaiz Jan 6, 2025
b93b8d6
Merge branch 'master' into fix/drop-on-folder
odeimaiz Jan 7, 2025
5a3b39d
Merge branch 'master' into fix/drop-on-folder
odeimaiz Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
},
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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 => {
Expand All @@ -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({
Expand Down Expand Up @@ -1686,7 +1705,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 {
Expand All @@ -1713,7 +1732,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);
Expand Down
Loading