#328: fixed project search issue on navbar

fabric-testbed · Jul 18, 2024 · 00618b8 · 00618b8
1 parent eabf7b6
commit 00618b8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/components/Experiment/Projects.jsx b/src/components/Experiment/Projects.jsx
@@ -74,9 +74,15 @@ class Projects extends React.Component {
   generateCommunityFilterQuery = (selectedList) => {
     const communities = [];
     for (const s of selectedList) {
-      communities.push(s.name);
-      if (portalData.communityMapping[s.name]) {
-        communities.push(`${s.name}:${portalData.communityMapping[s.name]}`);
+      if (s.name === "HPC" || s.name === "RNE") {
+        communities.push(`Additional Communities:${s.name}`);
+      } else {
+        communities.push(s.name);
+        if (portalData.communityMapping[s.name]) {
+          for (const sub of portalData.communityMapping[s.name]) {
+            communities.push(`${s.name}:${sub}`);
+          }
+        }
       }
     }
     return communities.toString();

diff --git a/src/components/Header.jsx b/src/components/Header.jsx
@@ -12,8 +12,7 @@ import betaLogo from "../imgs/logos/fabric-brand-beta.png";
 import ProfileModal from './ProfileModal';
 
 const Header = (props) => {
-  const navItems = ((props.globalRoles && props.globalRoles.isJupterhubUser) ||
-    props.userStatus !== "active") ? [
+  const navItems = (props.globalRoles && !props.globalRoles.isJupterhubUser) ? [
     { name: "Resources", path: "/resources/all", child: [] },
     {
       name: "Experiments",
@@ -28,9 +27,8 @@ const Header = (props) => {
     },
     {
       name: "JupyterHub",
-      href: portalData.jupyterHubLinks[checkPortalType(window.location.href)],
       child: [],
-      path: ""
+      path: "/jupyter-no-access"
     },
     { name: "Contact Us", path: "/help", child: [] },
     {
@@ -100,8 +98,9 @@ const Header = (props) => {
     },
     {
       name: "JupyterHub",
+      href: portalData.jupyterHubLinks[checkPortalType(window.location.href)],
       child: [],
-      path: "/jupyter-no-access"
+      path: ""
     },
     { name: "Contact Us", path: "/help", child: [] },
     {

diff --git a/src/pages/SearchResults.jsx b/src/pages/SearchResults.jsx
@@ -26,7 +26,7 @@ class SearchResults extends Component {
     if (query !== "") {
       this.setState({ showSpinner: true });
       try {
-        const { data: res1 } = await getProjects("allProjects", 0, limit, query);
+        const { data: res1 } = await getProjects("allProjects", 0, limit, query, "description");
         const projectCount = res1.total;
         let projects = res1.results;
         const { data: res2 } = await getFullPeopleByName(0, limit, query);