Skip to content

Commit 7ebbe4b

Browse files
committed
col.sortable
1 parent 930cc96 commit 7ebbe4b

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ qx.Class.define("osparc.jobs.JobsTable", {
5050
statics: {
5151
COLS: {
5252
PROJECT_UUID: {
53-
id: "jobId",
53+
id: "projectUuid",
5454
column: 0,
5555
label: qx.locale.Manager.tr("Project Id"),
5656
width: 170
@@ -59,7 +59,8 @@ qx.Class.define("osparc.jobs.JobsTable", {
5959
id: "projectName",
6060
column: 1,
6161
label: qx.locale.Manager.tr("Project Name"),
62-
width: 170
62+
width: 170,
63+
sortable: true
6364
},
6465
STATE: {
6566
id: "state",
@@ -71,19 +72,22 @@ qx.Class.define("osparc.jobs.JobsTable", {
7172
id: "submit",
7273
column: 3,
7374
label: qx.locale.Manager.tr("Submitted"),
74-
width: 130
75+
width: 130,
76+
sortable: true
7577
},
7678
START: {
7779
id: "start",
7880
column: 4,
7981
label: qx.locale.Manager.tr("Started"),
80-
width: 130
82+
width: 130,
83+
sortable: true
8184
},
8285
END: {
8386
id: "end",
8487
column: 5,
8588
label: qx.locale.Manager.tr("Ended"),
86-
width: 130
89+
width: 130,
90+
sortable: true
8791
},
8892
INFO: {
8993
id: "info",
@@ -136,14 +140,15 @@ qx.Class.define("osparc.jobs.JobsTable", {
136140
const rowData = this.getTableModel().getRowData(row);
137141
switch (action) {
138142
case "info": {
139-
const jobInfo = new osparc.jobs.JobInfo(rowData["jobId"]);
140-
osparc.jobs.JobInfo.popUpInWindow(jobInfo);
143+
const jobInfo = new osparc.jobs.JobInfo(rowData["projectUuid"]);
144+
const win = osparc.jobs.JobInfo.popUpInWindow(jobInfo);
145+
win.setCaption(win.getCaption() + " - " + rowData["projectName"]);
141146
break;
142147
}
143148
case "stop":
144149
case "delete":
145150
case "logs": {
146-
const msg = `I wish I could ${action} the job ${rowData["jobId"]}`;
151+
const msg = `I wish I could ${action} the job ${rowData["projectUuid"]}`;
147152
osparc.FlashMessenger.logAs(msg, "WARNING");
148153
break;
149154
}

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@ qx.Class.define("osparc.jobs.JobsTableModel", {
2929

3030
this.setSortColumnIndexWithoutSortingData(jobsCols.SUBMIT.column);
3131
this.setSortAscendingWithoutSortingData(false);
32-
this.setColumnSortable(jobsCols.STATE.column, false);
33-
this.setColumnSortable(jobsCols.INFO.column, false);
34-
this.setColumnSortable(jobsCols.ACTION_STOP.column, false);
35-
this.setColumnSortable(jobsCols.ACTION_RUN.column, false);
36-
this.setColumnSortable(jobsCols.ACTION_RETRY.column, false);
37-
this.setColumnSortable(jobsCols.ACTION_MORE.column, false);
32+
Object.values(jobsCols).forEach(col => {
33+
this.setColumnSortable(col.column, Boolean(col.sortable));
34+
});
3835
},
3936

4037
properties: {

0 commit comments

Comments
 (0)