Skip to content

Commit 5347b7a

Browse files
committed
it works
1 parent e49a5be commit 5347b7a

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

services/static-webserver/client/source/class/osparc/dashboard/WorkspacesAndFoldersTree.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,8 @@ qx.Class.define("osparc.dashboard.WorkspacesAndFoldersTree", {
303303
// eslint-disable-next-line no-negated-condition
304304
const parentModel = this.__getModel(folder.getWorkspaceId(), oldParentFolderId !== undefined ? oldParentFolderId : folder.getParentFolderId());
305305
if (parentModel) {
306-
const idx = parentModel.getChildren().toArray().findIndex(c => folder.getWorkspaceId() === c.getWorkspaceId() && folder.getFolderId() === c.getFolderId());
306+
console.log("folder removed: children", parentModel.getChildren().toArray());
307+
const idx = parentModel.getChildren().toArray().findIndex(c => "getWorkspaceId" in c && folder.getWorkspaceId() === c.getWorkspaceId() && folder.getFolderId() === c.getFolderId());
307308
if (idx > -1) {
308309
parentModel.getChildren().removeAt(idx);
309310
}

services/static-webserver/client/source/class/osparc/store/Folders.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,22 @@ qx.Class.define("osparc.store.Folders", {
212212
};
213213
return osparc.data.Resources.getInstance().fetch("folders", "update", params)
214214
.then(folderData => {
215-
this.__addToCache(folderData);
215+
const folderMoved = updateData.parentFolderId !== oldParentFolderId;
216+
if (folderMoved) {
217+
this.fireDataEvent("folderRemoved", folder);
218+
}
219+
this.__addToCache(folderData); // it will update the folder model
220+
if (folderMoved) {
221+
this.fireDataEvent("folderAdded", folder);
222+
}
223+
/*
216224
if (updateData.parentFolderId !== oldParentFolderId) {
217225
this.fireDataEvent("folderMoved", {
218226
folder,
219227
oldParentFolderId,
220228
});
221229
}
230+
*/
222231
})
223232
.catch(console.error);
224233
},
@@ -255,11 +264,15 @@ qx.Class.define("osparc.store.Folders", {
255264
};
256265
return osparc.data.Resources.fetch("folders", "moveToWorkspace", params)
257266
.then(() => {
267+
this.fireDataEvent("folderRemoved", folder);
258268
folder.setWorkspaceId(destWorkspaceId);
269+
this.fireDataEvent("folderAdded", folder);
270+
/*
259271
this.fireDataEvent("folderMoved", {
260272
folder,
261273
oldParentFolderId,
262274
});
275+
*/
263276
})
264277
.catch(err => console.error(err));
265278
},

0 commit comments

Comments
 (0)