Skip to content

Commit 14e0a66

Browse files
🎨 [Frontend] Filter Runs (#7728)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 89f3caf commit 14e0a66

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ qx.Class.define("osparc.data.Resources", {
352352
endpoints: {
353353
getPageLatest: {
354354
method: "GET",
355-
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}"
355+
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}"
356356
},
357357
getPageHistory: {
358358
method: "GET",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ qx.Class.define("osparc.desktop.MainPage", {
6969
preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
7070
preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
7171
preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
72-
preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsActive());
72+
preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsLatest());
7373
Promise.all(preloadPromises)
7474
.then(() => {
7575
const mainStack = this.__createMainStack();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ qx.Class.define("osparc.jobs.JobsButton", {
3434

3535
const jobsStore = osparc.store.Jobs.getInstance();
3636
jobsStore.addListener("changeJobsActive", e => this.__updateJobsButton(e.getData()), this);
37-
jobsStore.fetchJobsActive();
37+
jobsStore.fetchJobsLatest();
3838
},
3939

4040
members: {

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(); // @matusdrobuliak66: 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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
7575
nullable: true,
7676
check : "String",
7777
init: "",
78+
apply: "reloadData",
7879
},
7980
},
8081

@@ -95,7 +96,8 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
9596
if (this.getProjectUuid()) {
9697
promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy, resolveWResponse);
9798
} else {
98-
promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy, resolveWResponse);
99+
const filters = this.getFilterString() ? { text: this.getFilterString() } : null;
100+
promise = osparc.store.Jobs.getInstance().fetchJobsLatest(this.getRunningOnly(), offset, limit, orderBy, filters, resolveWResponse);
99101
}
100102
promise
101103
.then(resp => {
@@ -118,7 +120,8 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
118120
if (this.getProjectUuid()) {
119121
promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy);
120122
} else {
121-
promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy);
123+
const filters = this.getFilterString() ? { text: this.getFilterString() } : null;
124+
promise = osparc.store.Jobs.getInstance().fetchJobsLatest(this.getRunningOnly(), offset, limit, orderBy, filters);
122125
}
123126
return promise
124127
.then(jobs => {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,15 @@ qx.Class.define("osparc.store.Jobs", {
3737
},
3838

3939
members: {
40-
fetchJobsActive: function(
40+
fetchJobsLatest: function(
4141
runningOnly = true,
4242
offset = 0,
4343
limit = this.self().SERVER_MAX_LIMIT,
4444
orderBy = {
4545
field: "submitted_at",
4646
direction: "desc"
4747
},
48+
filters = null,
4849
resolveWResponse = false
4950
) {
5051
const params = {
@@ -53,6 +54,7 @@ qx.Class.define("osparc.store.Jobs", {
5354
offset,
5455
limit,
5556
orderBy: JSON.stringify(orderBy),
57+
filters: JSON.stringify(filters ? filters : {}),
5658
}
5759
};
5860
const options = {

0 commit comments

Comments
 (0)