resetButtonPressed

Author: odeimaiz

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

@@ -106,7 +106,8 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
   },
 
   events: {
-    "filterChanged": "qx.event.type.Data"
+    "filterChanged": "qx.event.type.Data",
+    "resetButtonPressed": "qx.event.type.Event",
   },
 
   members: {
@@ -413,6 +414,7 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
     resetButtonPressed: function() {
       this.resetFilters();
       this.__filter();
+      this.fireEvent("resetButtonPressed");
     },
 
     getFilterData: function() {

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

@@ -1085,6 +1085,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       searchBarTextField.set({
         cursor: "pointer",
       });
+      searchBarTextField.addListener("resetButtonPressed", () => this.__filterChanged());
       searchBarTextField.addListener("tap", () => this.__extendSearchBar());
 
       const header = this.__header = new osparc.dashboard.StudyBrowserHeader();
@@ -1249,57 +1250,61 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
 
       this._searchBarFilter.addListener("filterChanged", e => {
         const filterData = e.getData();
-        let searchContext = null;
-        let backToContext = null;
-        switch (this.getCurrentContext()) {
-          case osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS:
-          case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS:
-          case osparc.dashboard.StudyBrowser.CONTEXT.TRASH:
-            if (filterData.text) {
-              searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS;
-            } else {
-              backToContext = osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS;
-            }
-            break;
-          case osparc.dashboard.StudyBrowser.CONTEXT.TEMPLATES:
-          case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_TEMPLATES:
-            if (filterData.text) {
-              searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_TEMPLATES;
-            } else {
-              backToContext = osparc.dashboard.StudyBrowser.CONTEXT.TEMPLATES;
-            }
-            break;
-          case osparc.dashboard.StudyBrowser.CONTEXT.PUBLIC_TEMPLATES:
-          case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES:
-            if (filterData.text) {
-              searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES;
-            } else {
-              backToContext = osparc.dashboard.StudyBrowser.CONTEXT.PUBLIC_TEMPLATES;
-            }
-            break;
-          case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
-            // functions are not searchable yet
-            searchContext = null;
-            backToContext = osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS;
-            break;
-          default:
-            if (filterData.text) {
-              searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS;
-            } else {
-              backToContext = osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS;
-            }
-            break;
-        }
-        if (searchContext) {
-          this._changeContext(searchContext);
-        } else if (backToContext) {
-          const workspaceId = this.getCurrentWorkspaceId();
-          const folderId = this.getCurrentFolderId();
-          this._changeContext(backToContext, workspaceId, folderId);
-        }
+        this.__filterChanged(filterData);
       });
     },
 
+    __filterChanged: function(filterData) {
+      let searchContext = null;
+      let backToContext = null;
+      switch (this.getCurrentContext()) {
+        case osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS:
+        case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS:
+        case osparc.dashboard.StudyBrowser.CONTEXT.TRASH:
+          if (filterData && filterData.text) {
+            searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS;
+          } else {
+            backToContext = osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS;
+          }
+          break;
+        case osparc.dashboard.StudyBrowser.CONTEXT.TEMPLATES:
+        case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_TEMPLATES:
+          if (filterData && filterData.text) {
+            searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_TEMPLATES;
+          } else {
+            backToContext = osparc.dashboard.StudyBrowser.CONTEXT.TEMPLATES;
+          }
+          break;
+        case osparc.dashboard.StudyBrowser.CONTEXT.PUBLIC_TEMPLATES:
+        case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES:
+          if (filterData && filterData.text) {
+            searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PUBLIC_TEMPLATES;
+          } else {
+            backToContext = osparc.dashboard.StudyBrowser.CONTEXT.PUBLIC_TEMPLATES;
+          }
+          break;
+        case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
+          // functions are not searchable yet
+          searchContext = null;
+          backToContext = osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS;
+          break;
+        default:
+          if (filterData && filterData.text) {
+            searchContext = osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS;
+          } else {
+            backToContext = osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS;
+          }
+          break;
+      }
+      if (searchContext) {
+        this._changeContext(searchContext);
+      } else if (backToContext) {
+        const workspaceId = this.getCurrentWorkspaceId();
+        const folderId = this.getCurrentFolderId();
+        this._changeContext(backToContext, workspaceId, folderId);
+      }
+    },
+
     _changeContext: function(context, workspaceId = null, folderId = null) {
       if (
         !context.includes("search") && // load projects if search string changed