Skip to content

Commit 502ac45

Browse files
authored
🎨 [Frontend] Make the frontend dont-show-folders compatible (ITISFoundation#6387)
1 parent 9057d01 commit 502ac45

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
386386
this._searchBarFilter.setSharedWithActiveFilter(sharedWith.id, sharedWith.label);
387387
}, this);
388388

389-
if (this._resourceType === "study") {
389+
if (this._resourceType === "study" && osparc.utils.DisabledPlugins.isFoldersEnabled()) {
390390
const workspacesAndFoldersTree = resourceFilter.getWorkspacesAndFoldersTree();
391391
workspacesAndFoldersTree.getSelection().addListener("change", () => {
392392
const selection = workspacesAndFoldersTree.getSelection();

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
4747
__serviceTypeButtons: null,
4848

4949
__buildLayout: function() {
50-
if (this.__resourceType === "study") {
50+
if (this.__resourceType === "study" && osparc.utils.DisabledPlugins.isFoldersEnabled()) {
5151
this._add(this.__createWorkspacesAndFoldersTree());
5252
} else {
5353
this._add(this.__createSharedWithFilterLayout());
@@ -140,11 +140,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
140140
})
141141
});
142142
}
143-
if (option.id !== "show-all") {
144-
button.set({
145-
marginLeft: 15
146-
});
147-
}
148143
}
149144
button.id = option.id;
150145

0 commit comments

Comments
 (0)