Skip to content

Commit 37e22f6

Browse files
committed
getPageLatestFiltered
1 parent 1a9b912 commit 37e22f6

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

services/static-webserver/client/source/class/osparc/data/Resources.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,10 @@ qx.Class.define("osparc.data.Resources", {
354354
method: "GET",
355355
url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D&filter_only_running={runningOnly}"
356356
},
357+
getPageLatestFiltered: {
358+
method: "GET",
359+
url: statics.API + "/computations/-/iterations/latest?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D&filter_only_running={runningOnly}&filters={filters}"
360+
},
357361
getPageHistory: {
358362
method: "GET",
359363
url: statics.API + "/computations/{studyId}/iterations?offset={offset}&limit={limit}&order_by=%7B%22field%22:%22submitted_at%22,%22direction%22:%22desc%22%7D&include_children={includeChildren}"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ qx.Class.define("osparc.jobs.RunsBrowser", {
5757
allowStretchX: true,
5858
margin: 0
5959
});
60+
control.getChildControl("textfield").set({
61+
placeholder: qx.locale.Manager.tr("Filter by name or ID"),
62+
});
63+
// control.hide(); // MD: remove this when the backend is ready
6064
this.getChildControl("header-filter").add(control, {
6165
flex: 1
6266
});

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
9595
if (this.getProjectUuid()) {
9696
promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy, resolveWResponse);
9797
} else {
98-
promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy, resolveWResponse);
98+
const filters = null;
99+
promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy, filters, resolveWResponse);
99100
}
100101
promise
101102
.then(resp => {
@@ -118,7 +119,8 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
118119
if (this.getProjectUuid()) {
119120
promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy);
120121
} else {
121-
promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy);
122+
const filters = null;
123+
promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy, filters);
122124
}
123125
return promise
124126
.then(jobs => {

services/static-webserver/client/source/class/osparc/store/Jobs.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ qx.Class.define("osparc.store.Jobs", {
4545
field: "submitted_at",
4646
direction: "desc"
4747
},
48+
filters = null,
4849
resolveWResponse = false
4950
) {
5051
const params = {
@@ -58,7 +59,13 @@ qx.Class.define("osparc.store.Jobs", {
5859
const options = {
5960
resolveWResponse: true
6061
};
61-
return osparc.data.Resources.fetch("runs", "getPageLatest", params, options)
62+
if (filters) {
63+
params["url"]["filters"] = JSON.stringify(filters);
64+
promise = osparc.data.Resources.fetch("runs", "getPageLatestFiltered", params, options);
65+
} else {
66+
promise = osparc.data.Resources.fetch("runs", "getPageLatest", params, options);
67+
}
68+
return promise
6269
.then(jobsResp => {
6370
if (runningOnly) {
6471
this.fireDataEvent("changeJobsActive", jobsResp["_meta"]["total"]);

0 commit comments

Comments
 (0)