From 502ac45d9dfcbf32dd70340bc26ae770ab7a6876 Mon Sep 17 00:00:00 2001 From: Odei Maiz <33152403+odeimaiz@users.noreply.github.com> Date: Wed, 18 Sep 2024 13:22:40 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20[Frontend]=20Make=20the=20fronte?= =?UTF-8?q?nd=20dont-show-folders=20compatible=20(#6387)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/class/osparc/dashboard/ResourceBrowserBase.js | 2 +- .../client/source/class/osparc/dashboard/ResourceFilter.js | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js index b63b1a12074..a52dc18a38a 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js @@ -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(); diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js index 234387a2f56..601de618d78 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/ResourceFilter.js @@ -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()); @@ -140,11 +140,6 @@ qx.Class.define("osparc.dashboard.ResourceFilter", { }) }); } - if (option.id !== "show-all") { - button.set({ - marginLeft: 15 - }); - } } button.id = option.id;