Skip to content

Commit 3604467

Browse files
committed
osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS
1 parent 1243603 commit 3604467

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

services/static-webserver/client/source/class/osparc/dashboard/ResourceContainerManager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
163163
text = this.tr("No Public Projects found");
164164
break;
165165
case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
166+
case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS:
166167
text = this.tr("No Functions found");
167168
break;
168169
}

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
5858
SEARCH_PROJECTS: "searchProjects",
5959
SEARCH_TEMPLATES: "searchTemplates",
6060
SEARCH_PUBLIC_TEMPLATES: "searchPublicTemplates",
61+
SEARCH_FUNCTIONS: "searchFunctions",
6162
}
6263
},
6364

@@ -73,6 +74,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
7374
"searchProjects", // osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS,
7475
"searchTemplates", // osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_TEMPLATES,
7576
"searchPublicTemplates", // osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES,
77+
"searchFunctions", // osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS,
7678
],
7779
nullable: false,
7880
init: "studiesAndFolders",
@@ -336,7 +338,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
336338
this.__addResourcesToList(filteredTemplates);
337339
break;
338340
}
339-
case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS: {
341+
case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
342+
case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS: {
340343
const functions = resp["data"];
341344
functions.forEach(func => func["resourceType"] = "function");
342345
this.__addResourcesToList(functions);
@@ -886,6 +889,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
886889
requestParams.accessRights = "public";
887890
break;
888891
case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
892+
case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS:
889893
delete requestParams.orderBy; // functions do not support ordering yet
890894
requestParams.includeExtras = "true";
891895
break;
@@ -1285,9 +1289,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
12851289
}
12861290
break;
12871291
case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
1288-
// functions are not searchable yet
1289-
searchContext = null;
1290-
backToContext = osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS;
1292+
case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS:
1293+
if (filterData && filterData.text) {
1294+
searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS;
1295+
} else {
1296+
backToContext = osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS;
1297+
}
12911298
break;
12921299
default:
12931300
if (filterData && filterData.text) {
@@ -1395,10 +1402,11 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
13951402
this.__reloadStudies();
13961403
break;
13971404
case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
1398-
this._searchBarFilter.resetFilters();
1405+
case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS:
1406+
if (this.getCurrentContext() === osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS) {
1407+
this._searchBarFilter.resetFilters();
1408+
}
13991409
this._searchBarFilter.getChildControl("text-field").setPlaceholder("Search in Functions");
1400-
// functions can't be searched yet
1401-
this._searchBarFilter.setEnabled(false);
14021410
// functions can't be sorted yet
14031411
this.__sortByButton.exclude();
14041412
this._loadingResourcesBtn.setFetching(false);

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowserHeader.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,9 @@ qx.Class.define("osparc.dashboard.StudyBrowserHeader", {
334334
this.__setIcon("@FontAwesome5Solid/search/24");
335335
title.setValue(this.tr("Public Projects results"));
336336
break;
337+
case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS:
338+
this.__setIcon("@FontAwesome5Solid/search/24");
339+
title.setValue(this.tr("Functions results"));
337340
}
338341
},
339342

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ qx.Class.define("osparc.store.Store", {
8686
"searchProjects", // osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS,
8787
"searchTemplates", // osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_TEMPLATES,
8888
"searchPublicTemplates", // osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES,
89+
"searchFunctions", // osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS,
8990
],
9091
init: "studiesAndFolders",
9192
nullable: false,

0 commit comments

Comments
 (0)