Skip to content

Commit b2b9e3e

Browse files
authored
🐛 [Frontend] Fix: Select searched folder (#9032)
1 parent b5ae68e commit b2b9e3e

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,11 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
326326
const studyBrowserContext = osparc.store.Store.getInstance().getStudyBrowserContext();
327327
// do not allow selecting workspace
328328
if (studyBrowserContext !== osparc.dashboard.StudyBrowser.CONTEXT.TRASH) {
329-
this.fireDataEvent("folderSelected", this.getFolderId());
329+
// pass workspace id and folder id to be able to select the folder in the study browser
330+
this.fireDataEvent("folderSelected", {
331+
workspaceId: this.getFolder().getWorkspaceId(),
332+
folderId: this.getFolderId()
333+
});
330334
}
331335
},
332336

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,11 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
396396
resourcesContainer.addListener("studyToFolderRequested", e => this._studyToFolderRequested(e.getData()));
397397
resourcesContainer.addListener("folderToFolderRequested", e => this._folderToFolderRequested(e.getData()));
398398
resourcesContainer.addListener("folderSelected", e => {
399-
const folderId = e.getData();
400-
this._folderSelected(folderId);
399+
const {
400+
workspaceId,
401+
folderId,
402+
} = e.getData();
403+
this._folderSelected(workspaceId, folderId);
401404
}, this);
402405
resourcesContainer.addListener("workspaceSelected", e => {
403406
const workspaceId = e.getData();
@@ -1024,7 +1027,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
10241027
throw new Error("Abstract method called!");
10251028
},
10261029

1027-
_folderSelected: function(folderId) {
1030+
_folderSelected: function(workspaceId, folderId) {
10281031
throw new Error("Abstract method called!");
10291032
},
10301033

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,8 +669,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
669669
.catch(err => console.error(err));
670670
},
671671

672-
_folderSelected: function(folderId) {
673-
this._changeContext(osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS, this.getCurrentWorkspaceId(), folderId);
672+
_folderSelected: function(workspaceId, folderId) {
673+
this._changeContext(osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS, workspaceId, folderId);
674674
},
675675

676676
_folderUpdated: function() {

0 commit comments

Comments
 (0)