Skip to content

Commit ef46013

Browse files
committed
fixes
1 parent b58b6fe commit ef46013

File tree

5 files changed

+21
-27
lines changed

5 files changed

+21
-27
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
244244
this._addToLayout(searchBarFilter);
245245
},
246246

247-
_createResourcesLayout: function() {
247+
_createResourcesLayout: function(flatListId) {
248248
const toolbar = this._toolbar = new qx.ui.toolbar.ToolBar().set({
249249
backgroundColor: "transparent",
250250
spacing: 10,
@@ -255,7 +255,13 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
255255

256256
this.__viewModeLayout = new qx.ui.toolbar.Part();
257257

258-
const resourcesContainer = this._resourcesContainer = new osparc.dashboard.ResourceContainerManager();
258+
const resourcesContainer = this._resourcesContainer = new osparc.dashboard.ResourceContainerManager(this._resourceType);
259+
if (flatListId) {
260+
const list = this._resourcesContainer.getFlatList();
261+
if (list) {
262+
osparc.utils.Utils.setIdToWidget(list, flatListId);
263+
}
264+
}
259265
if (this._resourceType === "study") {
260266
const viewMode = osparc.utils.Utils.localCache.getLocalStorageItem("studiesViewMode");
261267
if (viewMode) {

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
qx.Class.define("osparc.dashboard.ResourceContainerManager", {
1919
extend: qx.ui.core.Widget,
2020

21-
construct: function() {
21+
construct: function(resourceType) {
2222
this.base(arguments);
2323

2424
this._setLayout(new qx.ui.layout.VBox(15));
@@ -32,14 +32,15 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
3232
this.__resourcesList = [];
3333
this.__groupedContainersList = [];
3434

35+
if (resourceType === "study") {
36+
const workspacesContainer = this.__workspacesContainer = new osparc.dashboard.ToggleButtonContainer();
37+
this._add(workspacesContainer);
38+
workspacesContainer.setVisibility(osparc.utils.DisabledPlugins.isFoldersEnabled() ? "visible" : "excluded");
3539

36-
const workspacesContainer = this.__workspacesContainer = new osparc.dashboard.ToggleButtonContainer();
37-
this._add(workspacesContainer);
38-
workspacesContainer.setVisibility(osparc.utils.DisabledPlugins.isFoldersEnabled() ? "visible" : "excluded");
39-
40-
const foldersContainer = this.__foldersContainer = new osparc.dashboard.ToggleButtonContainer();
41-
this._add(foldersContainer);
42-
foldersContainer.setVisibility(osparc.utils.DisabledPlugins.isFoldersEnabled() ? "visible" : "excluded");
40+
const foldersContainer = this.__foldersContainer = new osparc.dashboard.ToggleButtonContainer();
41+
this._add(foldersContainer);
42+
foldersContainer.setVisibility(osparc.utils.DisabledPlugins.isFoldersEnabled() ? "visible" : "excluded");
43+
}
4344

4445
const nonGroupedContainer = this.__nonGroupedContainer = this.__createFlatList();
4546
this._add(nonGroupedContainer);
@@ -503,7 +504,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
503504
}
504505
})
505506
.finally(() => {
506-
this._add(groupContainer);
507+
this.__groupedContainers.add(groupContainer);
507508
this.__moveNoGroupToLast();
508509
});
509510
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,7 @@ qx.Class.define("osparc.dashboard.ServiceBrowser", {
129129
// LAYOUT //
130130
_createLayout: function() {
131131
this._createSearchBar();
132-
this._createResourcesLayout();
133-
const list = this._resourcesContainer.getFlatList();
134-
if (list) {
135-
osparc.utils.Utils.setIdToWidget(list, "servicesList");
136-
}
132+
this._createResourcesLayout("servicesList");
137133

138134
this.__addNewServiceButtons();
139135
this._toolbar.add(new qx.ui.core.Spacer(), {

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -943,12 +943,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
943943
this._addToLayout(header);
944944
}
945945

946-
this._createResourcesLayout();
947-
948-
const list = this._resourcesContainer.getFlatList();
949-
if (list) {
950-
osparc.utils.Utils.setIdToWidget(list, "studiesList");
951-
}
946+
this._createResourcesLayout("studiesList");
952947

953948
const importStudyButton = this.__createImportButton();
954949
const isDisabled = osparc.utils.DisabledPlugins.isImportDisabled();

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
246246
// LAYOUT //
247247
_createLayout: function() {
248248
this._createSearchBar();
249-
this._createResourcesLayout();
250-
const list = this._resourcesContainer.getFlatList();
251-
if (list) {
252-
osparc.utils.Utils.setIdToWidget(list, "templatesList");
253-
}
249+
this._createResourcesLayout("templatesList");
254250

255251
const updateAllButton = this.__createUpdateAllButton();
256252
if (updateAllButton) {

0 commit comments

Comments
 (0)