Skip to content

Commit a037701

Browse files
odeimaizodeimaiz
committed
service -> app
1 parent dfb7602 commit a037701

File tree

12 files changed

+33
-36
lines changed

12 files changed

+33
-36
lines changed

‎services/static-webserver/client/source/class/osparc/dashboard/ServiceBrowser.js‎ renamed to ‎services/static-webserver/client/source/class/osparc/dashboard/AppBrowser.js‎

File renamed without changes.

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

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* Widget containing a TabView including:
2020
* - StudyBrowser
2121
* - TemplateBrowser
22-
* - ServiceBrowser
22+
* - AppBrowser
2323
* - DataBrowser
2424
*
2525
* *Example*
@@ -80,7 +80,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
8080
__studyBrowser: null,
8181
__templateBrowser: null,
8282
__hypertoolBrowser: null,
83-
__serviceBrowser: null,
83+
__appBrowser: null,
8484
__dataBrowser: null,
8585

8686
getStudyBrowser: function() {
@@ -91,12 +91,8 @@ qx.Class.define("osparc.dashboard.Dashboard", {
9191
return this.__templateBrowser;
9292
},
9393

94-
getHypertoolBrowser: function() {
95-
return this.__hypertoolBrowser;
96-
},
97-
98-
getServiceBrowser: function() {
99-
return this.__serviceBrowser;
94+
getAppBrowser: function() {
95+
return this.__appBrowser;
10096
},
10197

10298
__createMainViewLayout: function() {
@@ -136,11 +132,11 @@ qx.Class.define("osparc.dashboard.Dashboard", {
136132
}
137133
if (permissions.canDo("dashboard.services.read")) {
138134
tabs.push({
139-
id: "servicesTab",
140-
buttonId: "servicesTabBtn",
141-
label: this.tr("SERVICES"),
135+
id: "appsTab",
136+
buttonId: "appsTabBtn",
137+
label: this.tr("Apps"),
142138
icon: "@FontAwesome5Solid/cogs/"+tabIconSize,
143-
buildLayout: this.__createServiceBrowser
139+
buildLayout: this.__createAppBrowser
144140
});
145141
}
146142
if (permissions.canDo("dashboard.data.read")) {
@@ -206,8 +202,8 @@ qx.Class.define("osparc.dashboard.Dashboard", {
206202
if (this.__studyBrowser) {
207203
this.__studyBrowser.initResources();
208204
}
209-
if (this.__serviceBrowser) {
210-
this.__serviceBrowser.initResources();
205+
if (this.__appBrowser) {
206+
this.__appBrowser.initResources();
211207
}
212208
if (this.__dataBrowser) {
213209
this.__dataBrowser.initResources();
@@ -239,9 +235,9 @@ qx.Class.define("osparc.dashboard.Dashboard", {
239235
return hypertoolsView;
240236
},
241237

242-
__createServiceBrowser: function() {
243-
const servicesView = this.__serviceBrowser = new osparc.dashboard.ServiceBrowser();
244-
return servicesView;
238+
__createAppBrowser: function() {
239+
const appsView = this.__appBrowser = new osparc.dashboard.AppBrowser();
240+
return appsView;
245241
},
246242

247243
__createDataBrowser: function() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
235235

236236
if (permissions.canDo("dashboard.services.read")) {
237237
const servicesButton = this.self().createMenuButton("@FontAwesome5Solid/cog/16", this.tr("Services..."));
238-
servicesButton.addListener("execute", () => this.fireDataEvent("changeTab", "servicesTab"), this);
238+
servicesButton.addListener("execute", () => this.fireDataEvent("changeTab", "appsTab"), this);
239239
moreMenu.add(servicesButton);
240240
}
241241
moreMenuButton.setVisibility(moreMenu.getChildren().length ? "visible" : "excluded");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,10 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
298298
icon: "@FontAwesome5Solid/cogs/16",
299299
paddingLeft: 10, // align it with the context
300300
});
301-
osparc.utils.Utils.setIdToWidget(servicesButton, "servicesTabBtn");
301+
osparc.utils.Utils.setIdToWidget(servicesButton, "appsTabBtn");
302302
servicesButton.addListener("tap", () => {
303303
servicesButton.setValue(this.__resourceType === "service");
304-
this.fireDataEvent("changeTab", "servicesTab");
304+
this.fireDataEvent("changeTab", "appsTab");
305305
});
306306
return servicesButton;
307307
},

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* - Dashboard Stack
2828
* - StudyBrowser
2929
* - TemplateBrowser
30-
* - ServiceBrowser
30+
* - AppBrowser
3131
* - DataManager
3232
* - StudyEditor
3333
*
@@ -251,7 +251,7 @@ qx.Class.define("osparc.desktop.MainPage", {
251251
pollTasks.createPollingTask(fetchPromise)
252252
.then(task => {
253253
const templateBrowser = this.__dashboard.getTemplateBrowser();
254-
const hypertoolBrowser = this.__dashboard.getHypertoolBrowser();
254+
const appBrowser = this.__dashboard.getAppBrowser();
255255
if (templateBrowser) {
256256
templateBrowser.taskToTemplateReceived(task, studyName);
257257
}
@@ -267,8 +267,9 @@ qx.Class.define("osparc.desktop.MainPage", {
267267
if (templateBrowser) {
268268
templateBrowser.reloadResources();
269269
}
270-
if (hypertoolBrowser) {
271-
hypertoolBrowser.reloadResources();
270+
if (appBrowser) {
271+
// OM: reload hypertools only
272+
appBrowser.reloadResources();
272273
}
273274
});
274275
}

‎services/static-webserver/client/source/resource/osparc/tours/osparc_tours.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
"placement": "bottom"
6161
}, {
6262
"beforeClick": {
63-
"selector": "osparc-test-id=servicesTabBtn"
63+
"selector": "osparc-test-id=appsTabBtn"
6464
},
65-
"anchorEl": "osparc-test-id=servicesTabBtn",
65+
"anchorEl": "osparc-test-id=appsTabBtn",
6666
"text": "Every Study in oSparc is composed of so-called Services.<br>These are building blocks for Studies and can provide data/files, visualize results (2D, 3D), implement code in Jupyter notebooks or perform computations to execute simulations within a Study.",
6767
"placement": "bottom"
6868
}, {

‎services/static-webserver/client/source/resource/osparc/tours/s4l_tours.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
"placement": "bottom"
6161
}, {
6262
"beforeClick": {
63-
"selector": "osparc-test-id=servicesTabBtn"
63+
"selector": "osparc-test-id=appsTabBtn"
6464
},
65-
"anchorEl": "osparc-test-id=servicesTabBtn",
65+
"anchorEl": "osparc-test-id=appsTabBtn",
6666
"text": "Every Project in Sim4Life is composed of at least one so-called Service.<br>Services are building blocks for Projects and can provide data/files, visualize results (2D, 3D), implement code in Jupyter notebooks or perform computations to execute simulations within a Project.",
6767
"placement": "bottom"
6868
}]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ for (const product in products) {
175175
};
176176

177177
await checkButton("templatesTabBtn", isTemplatesVisible, templatesLabel);
178-
await checkButton("servicesTabBtn", isServicesVisible, servicesLabel);
178+
await checkButton("appsTabBtn", isServicesVisible, servicesLabel);
179179
await checkButton("dataTabBtn", isDataVisible, dataLabel);
180180
});
181181

‎tests/e2e-frontend/tests/serviceBrowser/leftFilters.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test.describe.serial(`Left Filters:`, () => {
2828

2929
await responsePromise;
3030

31-
await page.getByTestId("servicesTabBtn").click();
31+
await page.getByTestId("appsTabBtn").click();
3232
});
3333

3434
test.afterAll(async ({ browser }) => {

‎tests/e2e-frontend/tests/serviceBrowser/mainView.spec.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { LoginPage } from '../fixtures/loginPage';
77
import products from '../products.json';
88
import users from '../users.json';
99

10-
const servicesTabExposed = {
10+
const appsTabExposed = {
1111
"osparc": {
1212
"areServicesExposed": true,
1313
},
@@ -29,8 +29,8 @@ const servicesTabExposed = {
2929
}
3030

3131
for (const product in products) {
32-
expect(servicesTabExposed[product]).toBeDefined();
33-
if (!servicesTabExposed[product]["areServicesExposed"]) {
32+
expect(appsTabExposed[product]).toBeDefined();
33+
if (!appsTabExposed[product]["areServicesExposed"]) {
3434
continue;
3535
}
3636

@@ -62,7 +62,7 @@ for (const product in products) {
6262
expect("data" in resp && "_meta" in resp["data"] && "total" in resp["data"]["_meta"]);
6363
console.log("N Services in Response:", resp["data"]["_meta"]["total"]);
6464

65-
await page.getByTestId("servicesTabBtn").click();
65+
await page.getByTestId("appsTabBtn").click();
6666
});
6767

6868
test.afterAll(async ({ browser }) => {

0 commit comments

Comments
 (0)