Skip to content

🐛 [Frontend] Fix: filter tags with empty text #8428

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 3 commits into from
Sep 26, 2025
Merged

🐛 [Frontend] Fix: filter tags with empty text #8428

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
939d5af
fix
odeimaiz Sep 26, 2025
fe6c860
filterEnabled
odeimaiz Sep 26, 2025
10cfb8f
minor
odeimaiz Sep 26, 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
20 changes: 17 additions & 3 deletions services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
return;
}

let filterEnabled = false;
let request = null;
switch (this.getCurrentContext()) {
case osparc.dashboard.StudyBrowser.CONTEXT.WORKSPACES:
Expand All @@ -203,6 +204,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS: {
const filterData = this._searchBarFilter.getFilterData();
const text = filterData.text ? encodeURIComponent(filterData.text) : "";
filterEnabled = filterData.tags.length || filterData.sharedWith;
request = osparc.store.Workspaces.getInstance().searchWorkspaces(text, this.getOrderBy());
break;
}
Expand All @@ -212,6 +214,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
this.__setWorkspacesToList([]);
request
.then(workspaces => {
if (filterEnabled) {
return;
}
this.__setWorkspacesToList(workspaces);
if (this.getCurrentContext() === osparc.dashboard.StudyBrowser.CONTEXT.TRASH) {
if (workspaces.length) {
Expand Down Expand Up @@ -239,6 +244,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
return;
}

let filterEnabled = false;
let request = null;
switch (this.getCurrentContext()) {
case osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS: {
Expand All @@ -253,6 +259,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS: {
const filterData = this._searchBarFilter.getFilterData();
const text = filterData.text ? encodeURIComponent(filterData.text) : ""; // name, description and uuid
filterEnabled = filterData.tags.length || filterData.sharedWith;
request = osparc.store.Folders.getInstance().searchFolders(text, this.getOrderBy());
break;
}
Expand All @@ -262,6 +269,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
this.__setFoldersToList([]);
return request
.then(folders => {
if (filterEnabled) {
return;
}
this.__setFoldersToList(folders);
if (this.getCurrentContext() === osparc.dashboard.StudyBrowser.CONTEXT.TRASH) {
if (folders.length) {
Expand Down Expand Up @@ -792,9 +802,13 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
delete reqParams["limit"];
delete reqParams["offset"];
delete reqParams["filters"];
if (reqParams["text"]) {
// decodeURIComponent the text to compare it with the currentParams
reqParams["text"] = decodeURIComponent(reqParams["text"]);
if ("text" in reqParams) {
if (reqParams["text"] === "") {
delete reqParams["text"];
} else {
// decodeURIComponent the text to compare it with the currentParams
reqParams["text"] = decodeURIComponent(reqParams["text"]);
}
}

const cParams = this.__getRequestParams();
Expand Down
Loading