Skip to content

🐛 [Frontend] Move to folder #6355

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.

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 30 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
aeca58f
ciao Bizzy
odeimaiz Sep 11, 2024
877c1b9
minor
odeimaiz Sep 11, 2024
52b3737
coming soon
odeimaiz Sep 12, 2024
11e7563
Merge branch 'master' into prettify-tree
odeimaiz Sep 12, 2024
3b1f81a
sync names
odeimaiz Sep 12, 2024
56d3373
FRONTEND_APPS_AVAILABLE tiplite
odeimaiz Sep 12, 2024
9206ca2
"changeContext"
odeimaiz Sep 12, 2024
0e07b23
Merge branch 'prettify-tree' of github.com:odeimaiz/osparc-simcore in…
odeimaiz Sep 12, 2024
70c657d
missing method
odeimaiz Sep 12, 2024
dd3b414
minor
odeimaiz Sep 12, 2024
3b2d15a
apply context
odeimaiz Sep 12, 2024
58170ab
flexible tree
odeimaiz Sep 12, 2024
1aa1afa
minor
odeimaiz Sep 12, 2024
2e448e5
unused
odeimaiz Sep 12, 2024
2ca8896
folder cache needs a workspaceId
odeimaiz Sep 12, 2024
f72f25b
minor
odeimaiz Sep 12, 2024
83d4640
renaming
odeimaiz Sep 12, 2024
3ed351a
minor
odeimaiz Sep 12, 2024
bdde88a
fix tap folder
odeimaiz Sep 12, 2024
17664eb
minor
odeimaiz Sep 12, 2024
d769e4a
add and remove folders
odeimaiz Sep 12, 2024
0f5ffd3
add folder synced
odeimaiz Sep 12, 2024
8097573
and remove
odeimaiz Sep 12, 2024
e836bd6
minor
odeimaiz Sep 12, 2024
d3b8462
intro text
odeimaiz Sep 12, 2024
5acb49b
Merge branch 'master' into prettify-tree
odeimaiz Sep 12, 2024
0cae787
fix move to folder
odeimaiz Sep 12, 2024
2aa26e1
move folder
odeimaiz Sep 12, 2024
d853e2d
Merge branch 'prettify-tree' of github.com:odeimaiz/osparc-simcore in…
odeimaiz Sep 12, 2024
f6a1495
Merge branch 'master' into fix/move-to-folder
odeimaiz Sep 12, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
const newName = folderEditor.getLabel();
const updateData = {
"name": newName,
"parentFolderId": folder.getParentFolderId(),
};
osparc.store.Folders.getInstance().putFolder(this.getFolderId(), updateData)
.then(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ qx.Class.define("osparc.dashboard.MoveResourceToFolder", {
const folderId = e.getData();
moveButton.setEnabled(this.__currentFolderId !== folderId);
this.__selectedFolderId = folderId;
});
}, this);
moveButton.addListener("execute", () => {
this.fireDataEvent("moveToFolder", this.__selectedFolderId);
});
}, this);
},

events: {
Expand All @@ -55,7 +55,7 @@ qx.Class.define("osparc.dashboard.MoveResourceToFolder", {
switch (id) {
case "current-folder": {
const folder = osparc.store.Folders.getInstance().getFolder(this.__currentFolderId);
const currentFolderName = folder ? folder["name"] : "Home";
const currentFolderName = folder ? folder.getName() : "Home";
control = new qx.ui.basic.Label(this.tr("Current location: ") + currentFolderName);
this._add(control);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ qx.Class.define("osparc.dashboard.MoveResourceToWorkspace", {
} else {
moveButton.setEnabled(false);
}
});
}, this);
moveButton.addListener("execute", () => {
this.fireDataEvent("moveToWorkspace", this.__selectedWorkspaceId);
}, this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -496,19 +496,15 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
const win = osparc.ui.window.Window.popUpInWindow(moveFolderToFolder, title, 350, 280);
moveFolderToFolder.addListener("moveToFolder", e => {
win.close();
const folder = osparc.store.Folders.getInstance().getFolder(folderId);
const destFolderId = e.getData();
const params = {
url: {
folderId,
destFolderId,
}
const updatedData = {
name: folder.getName(),
parentFolderId: destFolderId,
};
osparc.data.Resources.fetch("folders", "moveToFolder", params)
osparc.store.Folders.getInstance().putFolder(folderId, updatedData)
.then(() => {
const folder = osparc.store.Folders.getInstance().getFolder(folderId);
if (folder) {
folder.setFolderId(destFolderId);
}
folder.setParentFolderId(destFolderId);
this.__reloadFolders()
})
.catch(err => console.error(err));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,6 @@ qx.Class.define("osparc.data.Resources", {
method: "DELETE",
url: statics.API + "/folders/{folderId}"
},
moveToFolder: {
method: "PUT",
url: statics.API + "/folders/{folderId}/folders/{destFolderId}"
},
moveToWorkspace: {
method: "PUT",
url: statics.API + "/folders/{folderId}/folders/{workspaceId}"
Expand Down
Loading