Skip to content

Commit 90cfcce

Browse files
committed
Activity Center
1 parent 56322c9 commit 90cfcce

File tree

4 files changed

+12
-112
lines changed

4 files changed

+12
-112
lines changed

services/static-webserver/client/source/class/osparc/jobs/RunsWindow.js renamed to services/static-webserver/client/source/class/osparc/jobs/ActivityCenterWindow.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
1616
************************************************************************ */
1717

18-
qx.Class.define("osparc.jobs.RunsWindow", {
18+
qx.Class.define("osparc.jobs.ActivityCenterWindow", {
1919
extend: osparc.ui.window.SingletonWindow,
2020

2121
construct: function() {
22-
this.base(arguments, "runs", this.tr("Runs and Clusters"));
22+
this.base(arguments, "runs", this.tr("Activity Center"));
2323

2424
this.set({
2525
layout: new qx.ui.layout.VBox(),
@@ -35,7 +35,7 @@ qx.Class.define("osparc.jobs.RunsWindow", {
3535

3636
statics: {
3737
openWindow: function() {
38-
const runsWindow = new osparc.jobs.RunsWindow();
38+
const runsWindow = new osparc.jobs.ActivityCenterWindow();
3939
runsWindow.center();
4040
runsWindow.open();
4141
return runsWindow;
@@ -49,26 +49,26 @@ qx.Class.define("osparc.jobs.RunsWindow", {
4949
flex: 1
5050
});
5151

52-
const runsAndClusters = new osparc.jobs.RunsAndClusters();
52+
const runsBrowser = new osparc.jobs.RunsBrowser();
5353
const subRunsBrowser = new osparc.jobs.SubRunsBrowser();
54-
stack.add(runsAndClusters);
54+
stack.add(runsBrowser);
5555
stack.add(subRunsBrowser);
5656

57-
runsAndClusters.addListener("runSelected", e => {
57+
runsBrowser.addListener("runSelected", e => {
5858
const project = e.getData();
5959
subRunsBrowser.setProject(project);
6060
this.getChildControl("title").setValue(this.tr("Runs"));
6161
stack.setSelection([subRunsBrowser]);
6262
});
6363

6464
subRunsBrowser.addListener("backToRuns", () => {
65-
runsAndClusters.getChildControl("runs-browser").reloadRuns();
66-
this.getChildControl("title").setValue(this.tr("Runs and Clusters"));
67-
stack.setSelection([runsAndClusters]);
65+
runsBrowser.getChildControl("runs-browser").reloadRuns();
66+
this.getChildControl("title").setValue(this.tr("Activity Center"));
67+
stack.setSelection([runsBrowser]);
6868
});
6969

7070
this.addListener("close", () => {
71-
runsAndClusters.getChildControl("runs-browser").stopInterval();
71+
runsBrowser.getChildControl("runs-browser").stopInterval();
7272
subRunsBrowser.stopInterval();
7373
});
7474
},

services/static-webserver/client/source/class/osparc/jobs/JobsButton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ qx.Class.define("osparc.jobs.JobsButton", {
2828
alignX: "center",
2929
cursor: "pointer",
3030
visibility: "excluded",
31-
toolTipText: this.tr("Runs and Clusters"),
31+
toolTipText: this.tr("Activity Center"),
3232
});
3333

34-
this.addListener("tap", () => osparc.jobs.RunsWindow.openWindow(), this);
34+
this.addListener("tap", () => osparc.jobs.ActivityCenterWindow.openWindow(), this);
3535

3636
const jobsStore = osparc.store.Jobs.getInstance();
3737
jobsStore.addListener("changeJobs", e => this.__updateJobsButton(), this);

services/static-webserver/client/source/class/osparc/jobs/RunsAndClusters.js

Lines changed: 0 additions & 91 deletions
This file was deleted.

services/static-webserver/client/source/class/osparc/jobs/RunsBrowser.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ qx.Class.define("osparc.jobs.RunsBrowser", {
2525
this._setLayout(new qx.ui.layout.VBox(10));
2626

2727
const jobsFilter = this.getChildControl("jobs-filter");
28-
this.getChildControl("jobs-ongoing");
2928
const jobsTable = this.getChildControl("runs-table");
3029

3130
jobsFilter.getChildControl("textfield").addListener("input", e => {
@@ -61,14 +60,6 @@ qx.Class.define("osparc.jobs.RunsBrowser", {
6160
flex: 1
6261
});
6362
break;
64-
case "jobs-ongoing":
65-
control = new qx.ui.form.CheckBox().set({
66-
label: "Hide finished jobs",
67-
value: true,
68-
enabled: false,
69-
});
70-
this.getChildControl("header-filter").add(control);
71-
break;
7263
case "runs-table":
7364
control = new osparc.jobs.RunsTable();
7465
control.addListener("runSelected", e => this.fireDataEvent("runSelected", e.getData()));

0 commit comments

Comments
 (0)