Skip to content
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

🎨 [Frontend] Make the frontend dont-show-folders compatible #6387

Merged
merged 6 commits into from
Sep 18, 2024
Merged

🎨 [Frontend] Make the frontend dont-show-folders compatible #6387

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84eb4d7
isFoldersEnabled one more check
odeimaiz Sep 18, 2024
5eac286
more checks
odeimaiz Sep 18, 2024
1019b75
minor
odeimaiz Sep 18, 2024
4da132b
Merge branch 'master' into enh/scalate-compatibility
odeimaiz Sep 18, 2024
b839abd
Merge branch 'enh/scalate-compatibility' of github.com:odeimaiz/ospar…
odeimaiz Sep 18, 2024
18f8520
Merge branch 'master' into enh/scalate-compatibility
odeimaiz Sep 18, 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
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
this._searchBarFilter.setSharedWithActiveFilter(sharedWith.id, sharedWith.label);
}, this);

if (this._resourceType === "study") {
if (this._resourceType === "study" && osparc.utils.DisabledPlugins.isFoldersEnabled()) {
const workspacesAndFoldersTree = resourceFilter.getWorkspacesAndFoldersTree();
workspacesAndFoldersTree.getSelection().addListener("change", () => {
const selection = workspacesAndFoldersTree.getSelection();
Expand Down
7 changes: 1 addition & 6 deletions services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
__serviceTypeButtons: null,

__buildLayout: function() {
if (this.__resourceType === "study") {
if (this.__resourceType === "study" && osparc.utils.DisabledPlugins.isFoldersEnabled()) {
this._add(this.__createWorkspacesAndFoldersTree());
} else {
this._add(this.__createSharedWithFilterLayout());
Expand Down Expand Up @@ -140,11 +140,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
})
});
}
if (option.id !== "show-all") {
button.set({
marginLeft: 15
});
}
}
button.id = option.id;

Expand Down
Loading