Skip to content

🎨 [Frontend] Filter Runs #7728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 23, 2025
Merged

🎨 [Frontend] Filter Runs #7728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
37e22f6
getPageLatestFiltered
odeimaiz May 22, 2025
8ddfd48
pass filters
odeimaiz May 22, 2025
ec85f7f
minor
odeimaiz May 22, 2025
db06e29
pass filter
odeimaiz May 22, 2025
7ca9c6f
minor
odeimaiz May 22, 2025
bbd104f
reloadData after changed filter
odeimaiz May 22, 2025
cc88179
todo
odeimaiz May 22, 2025
7bd3a59
Merge branch 'master' into enh/filter-runs
odeimaiz May 22, 2025
c2a71c8
Merge branch 'master' into enh/filter-runs
mergify[bot] May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/data/Resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ qx.Class.define("osparc.data.Resources", {
endpoints: {
getPageLatest: {
method: "GET",
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}"
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}"
},
getPageHistory: {
method: "GET",
Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/desktop/MainPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ qx.Class.define("osparc.desktop.MainPage", {
preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsActive());
preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsLatest());
Promise.all(preloadPromises)
.then(() => {
const mainStack = this.__createMainStack();
Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/jobs/JobsButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ qx.Class.define("osparc.jobs.JobsButton", {

const jobsStore = osparc.store.Jobs.getInstance();
jobsStore.addListener("changeJobsActive", e => this.__updateJobsButton(e.getData()), this);
jobsStore.fetchJobsActive();
jobsStore.fetchJobsLatest();
},

members: {
Expand Down
4 changes: 4 additions & 0 deletions services/static-webserver/client/source/class/osparc/jobs/RunsBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ qx.Class.define("osparc.jobs.RunsBrowser", {
allowStretchX: true,
margin: 0
});
control.getChildControl("textfield").set({
placeholder: qx.locale.Manager.tr("Filter by name or ID"),
});
control.hide(); // @matusdrobuliak66: remove this when the backend is ready
this.getChildControl("header-filter").add(control, {
flex: 1
});
Expand Down
7 changes: 5 additions & 2 deletions services/static-webserver/client/source/class/osparc/jobs/RunsTableModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
nullable: true,
check : "String",
init: "",
apply: "reloadData",
},
},

Expand All @@ -95,7 +96,8 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
if (this.getProjectUuid()) {
promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy, resolveWResponse);
} else {
promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy, resolveWResponse);
const filters = this.getFilterString() ? { text: this.getFilterString() } : null;
promise = osparc.store.Jobs.getInstance().fetchJobsLatest(this.getRunningOnly(), offset, limit, orderBy, filters, resolveWResponse);
}
promise
.then(resp => {
Expand All @@ -118,7 +120,8 @@ qx.Class.define("osparc.jobs.RunsTableModel", {
if (this.getProjectUuid()) {
promise = osparc.store.Jobs.getInstance().fetchJobsHistory(this.getProjectUuid(), this.__includeChildren, offset, limit, orderBy);
} else {
promise = osparc.store.Jobs.getInstance().fetchJobsActive(this.getRunningOnly(), offset, limit, orderBy);
const filters = this.getFilterString() ? { text: this.getFilterString() } : null;
promise = osparc.store.Jobs.getInstance().fetchJobsLatest(this.getRunningOnly(), offset, limit, orderBy, filters);
}
return promise
.then(jobs => {
Expand Down
4 changes: 3 additions & 1 deletion services/static-webserver/client/source/class/osparc/store/Jobs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,15 @@ qx.Class.define("osparc.store.Jobs", {
},

members: {
fetchJobsActive: function(
fetchJobsLatest: function(
runningOnly = true,
offset = 0,
limit = this.self().SERVER_MAX_LIMIT,
orderBy = {
field: "submitted_at",
direction: "desc"
},
filters = null,
resolveWResponse = false
) {
const params = {
Expand All @@ -53,6 +54,7 @@ qx.Class.define("osparc.store.Jobs", {
offset,
limit,
orderBy: JSON.stringify(orderBy),
filters: JSON.stringify(filters ? filters : {}),
}
};
const options = {
Expand Down
Loading