#328: fixed project filter toolbar issue

fabric-testbed · Jul 15, 2024 · 53eca0d · 53eca0d
1 parent 03f43bd
commit 53eca0d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/src/components/Experiment/Projects.jsx b/src/components/Experiment/Projects.jsx
@@ -75,7 +75,9 @@ class Projects extends React.Component {
     const communities = [];
     for (const s of selectedList) {
       communities.push(s.name);
-      communities.push(`${s.name}:${portalData.communityMapping[s.name]}`);
+      if (portalData.communityMapping[s.name]) {
+        communities.push(`${s.name}:${portalData.communityMapping[s.name]}`);
+      }
     }
     return communities.toString();
   }
@@ -161,7 +163,8 @@ class Projects extends React.Component {
           ? { ...el, isActive: true }
           : { ...el, isActive: false }
       ),
-      currentPage: 1
+      currentPage: 1,
+      selectedList: []
     }), () => {
       this.reloadProjectsData();
     });

diff --git a/src/components/Resource/SiteDetailPage.jsx b/src/components/Resource/SiteDetailPage.jsx
@@ -68,7 +68,6 @@ class SiteDetailPage extends React.Component {
       const parsedObj1 = sitesParser(res1.data[0], sitesNameMapping.acronymToShortName);
       const siteName = this.props.location.pathname.split("s/")[1];
       const parsedObj2 = siteParserLevel2(res2.data[0], siteName, sitesNameMapping.acronymToShortName);
-      console.log(parsedObj2.hosts)
       this.setState({ 
         hosts: parsedObj2.hosts.filter(host => host.Site === siteName),
         data: parsedObj1.parsedSites.filter(s => s.name === siteName)[0],

diff --git a/src/pages/ProjectForm.jsx b/src/pages/ProjectForm.jsx
@@ -44,6 +44,7 @@ const ToastMessageWithLink = ({projectId, message}) => (
 
 class ProjectForm extends Form {
   state = {
+    originalProject: { name: "", profile: { references: [] }},
     data: {
       uuid: "",
       name: "",
@@ -166,7 +167,7 @@ class ProjectForm extends Form {
       if(project.memberships && !project.memberships.is_creator && 
         !project.memberships.is_member && !project.memberships.is_owner &&
         !this.state.globalRoles.isFacilityOperator) {
-          this.setState({ 
+          this.setState({
             data: project,
             fabricMatrix: project.profile.references.length > 0 ? project.profile.references["fabric_matrix"] : "",
             showSpinner: false,
@@ -178,7 +179,8 @@ class ProjectForm extends Form {
           });
       } else {
         // user is po/pm/pc or Facility Operator.
-        this.setState({ 
+        this.setState({
+          originalProject: project,
           data: this.mapToViewModel(project),
           fabricMatrix: project.profile.references.length > 0 ? project.profile.references[0].url : "",
           projectFunding: project.project_funding,
@@ -295,8 +297,8 @@ class ProjectForm extends Form {
       }
     });
 
-    const { data: project, projectFunding, communities, fabricMatrix } = this.state;
-    const originalMatrix = project.profile.references.length > 0 ? project.profile.references[0].url : "";
+    const { data: project, projectFunding, communities, fabricMatrix, originalProject } = this.state;
+    const originalMatrix = originalProject.profile.references.length > 0 ? originalProject.profile.references[0].url : "";
     try {
       await updateProject(project, this.parsePreferences());
       await updateProjectFunding(project.uuid, projectFunding);
@@ -574,7 +576,8 @@ class ProjectForm extends Form {
       volumes,
       projectFunding,
       communities,
-      fabricMatrix
+      fabricMatrix,
+      originalProject
     } = this.state;
 
     let canUpdate = !this.checkProjectExpiration(data.expired) && 
@@ -629,7 +632,7 @@ class ProjectForm extends Form {
       return (
         <div className="container">
           <div className="d-flex flex-row justify-content-between">
-            <h1>{data.name}</h1>
+            <h1>{originalProject.name}</h1>
             {
               canUpdate ?
               <div className="d-flex flex-row justify-content-end">

diff --git a/src/services/projectService.js b/src/services/projectService.js
@@ -9,7 +9,7 @@ export function getProjects(type, offset, limit, searchQuery, searchSet) {
     if (!searchQuery) {
       return http.get(`${apiEndpoint}?offset=${offset}&limit=${limit}&sort_by=created_time&order_by=desc&person_uuid=${userID}`);
     } else {
-      return http.get(`${apiEndpoint}?search=${searchQuery}&offset=${offset}&limit=${limit}&sort_by=created_time&order_by=desc&person_uuid=${userID}`);
+      return http.get(`${apiEndpoint}?search=${searchQuery}&offset=${offset}&limit=${limit}&sort_by=created_time&order_by=desc&person_uuid=${userID}&search_set=${searchSet}`);
     }
   } else if (type === "allProjects") {
     if (!searchQuery) {

diff --git a/src/styles/App.scss b/src/styles/App.scss
@@ -1244,11 +1244,11 @@ ul,
 }
 
 div:has(> #multiselectContainerReact) {
- width: 95%;
+ width: 94%;
 }
 
 .project-search-toolbar .input-group-prepend {
-  width: 5% !important;
+  width: 6% !important;
 }
 
 .project-search-toolbar .input-group-prepend .dropdown-toggle {