Skip to content

Commit 62c9d09

Browse files
committed
hide dashboard buttons
1 parent 3ef95b0 commit 62c9d09

File tree

5 files changed

+3
-45
lines changed

5 files changed

+3
-45
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ qx.Class.define("osparc.dashboard.Dashboard", {
3838
construct: function() {
3939
this.base(arguments);
4040

41-
osparc.utils.Utils.setIdToWidget(this.getChildControl("bar"), "dashboardTabs");
42-
osparc.utils.Utils.setIdToWidget(this, "dashboard");
41+
this.getChildControl("bar").set({
42+
visibility: "excluded",
43+
});
4344

4445
this.set({
4546
contentPadding: this.self().PADDING,

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,6 @@ qx.Class.define("osparc.desktop.MainPage", {
199199

200200
__createDashboardLayout: function() {
201201
const dashboard = this.__dashboard = new osparc.dashboard.Dashboard();
202-
const tabsBar = dashboard.getChildControl("bar");
203-
tabsBar.set({
204-
paddingBottom: 6
205-
});
206-
this.__navBar.addDashboardTabButtons(tabsBar);
207202
const dashboardLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
208203
dashboardLayout.add(dashboard, {
209204
flex: 1

services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -330,15 +330,6 @@ qx.Class.define("osparc.navigation.NavigationBar", {
330330
return registerButton;
331331
},
332332

333-
addDashboardTabButtons: function(tabButtons) {
334-
this.__tabButtons = tabButtons;
335-
this.getChildControl("center-items").add(tabButtons);
336-
this.bind("study", this.__tabButtons, "visibility", {
337-
converter: s => s ? "excluded" : "visible"
338-
});
339-
this.__navBarResized();
340-
},
341-
342333
__applyStudy: function(study) {
343334
const readOnlyInfo = this.getChildControl("read-only-info")
344335
if (study) {

tests/e2e-frontend/tests/navigationBar/navigationBar.spec.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ import users from '../users.json';
1010
const expectedElements = {
1111
"osparc": {
1212
"poweredByOsparc": false,
13-
"studies": {
14-
"visible": true,
15-
"label": "STUDIES",
16-
},
1713
"templates": {
1814
"visible": true,
1915
"label": "TEMPLATES",
@@ -33,10 +29,6 @@ const expectedElements = {
3329
},
3430
"s4l": {
3531
"poweredByOsparc": true,
36-
"studies": {
37-
"visible": true,
38-
"label": "PROJECTS",
39-
},
4032
"templates": {
4133
"visible": true,
4234
"label": "TUTORIALS",
@@ -55,10 +47,6 @@ const expectedElements = {
5547
},
5648
"s4lacad": {
5749
"poweredByOsparc": true,
58-
"studies": {
59-
"visible": true,
60-
"label": "PROJECTS",
61-
},
6250
"templates": {
6351
"visible": true,
6452
"label": "TUTORIALS",
@@ -77,10 +65,6 @@ const expectedElements = {
7765
},
7866
"s4llite": {
7967
"poweredByOsparc": true,
80-
"studies": {
81-
"visible": true,
82-
"label": "PROJECTS",
83-
},
8468
"templates": {
8569
"visible": true,
8670
"label": "TUTORIALS",
@@ -98,10 +82,6 @@ const expectedElements = {
9882
},
9983
"tis": {
10084
"poweredByOsparc": true,
101-
"studies": {
102-
"visible": true,
103-
"label": "STUDIES",
104-
},
10585
"templates": {
10686
"visible": false,
10787
},
@@ -118,10 +98,6 @@ const expectedElements = {
11898
},
11999
"tiplite": {
120100
"poweredByOsparc": true,
121-
"studies": {
122-
"visible": true,
123-
"label": "STUDIES",
124-
},
125101
"templates": {
126102
"visible": false,
127103
},
@@ -177,13 +153,10 @@ for (const product in products) {
177153
});
178154

179155
test(`Check Dashboard tabs`, async () => {
180-
expect(expectedElements[product]["studies"]).toBeDefined();
181156
expect(expectedElements[product]["templates"]).toBeDefined();
182157
expect(expectedElements[product]["services"]).toBeDefined();
183158
expect(expectedElements[product]["data"]).toBeDefined();
184159

185-
const isStudiesVisible = expectedElements[product]["studies"]["visible"];
186-
const studiesLabel = expectedElements[product]["studies"]["label"];
187160
const isTemplatesVisible = expectedElements[product]["templates"]["visible"];
188161
const templatesLabel = expectedElements[product]["templates"]["label"];
189162
const isServicesVisible = expectedElements[product]["services"]["visible"];
@@ -201,7 +174,6 @@ for (const product in products) {
201174
}
202175
};
203176

204-
await checkButton("studiesTabBtn", isStudiesVisible, studiesLabel);
205177
await checkButton("templatesTabBtn", isTemplatesVisible, templatesLabel);
206178
await checkButton("servicesTabBtn", isServicesVisible, servicesLabel);
207179
await checkButton("dataTabBtn", isDataVisible, dataLabel);

tests/e2e-playwright/tests/conftest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,6 @@ def wait_for_done(response):
552552
with log_context(logging.INFO, "Go back to dashboard"):
553553
page.get_by_test_id("dashboardBtn").click()
554554
page.get_by_test_id("confirmDashboardBtn").click()
555-
page.get_by_test_id("studiesTabBtn").click()
556555

557556
for project_uuid in created_project_uuids:
558557
with log_context(

0 commit comments

Comments
 (0)