changes for #15

Author: edison-nguyen

client/src/lib/company-attributes.js

@@ -3,11 +3,18 @@ import config from "../config";
 import * as OrgService from "../services/user-org";
 import Axios from "axios";
 
+let primaryAttributeIds = [
+  config.STANDARD_USER_ATTRIBUTES.location,
+  config.STANDARD_USER_ATTRIBUTES.isAvailable,
+  config.STANDARD_USER_ATTRIBUTES.title,
+  config.STANDARD_USER_ATTRIBUTES.company,
+];
+
 /**
  * Get the attributes associated with the company (organization)
  * @param {Object} apiClient The api client (you can get this from src/services/api and then call api() to get the apiClient)
  */
-export async function getCompanyAttributes(apiClient, cancelToken) {
+export async function getAttributes(apiClient, cancelToken) {
   let response;
   let attributeGroups;
   let attributes = [];
@@ -63,5 +70,22 @@ export async function getCompanyAttributes(apiClient, cancelToken) {
     }
   }
 
-  return attributes;
+  // Finally, split 2 attribute types
+  const companyAttrs = attributes.filter((attribute) => {
+    if (primaryAttributeIds.includes(attribute.name)) {
+      return false;
+    }
+
+    return true;
+  });
+
+  const generalAttrs = attributes.filter((attribute) => {
+    if (primaryAttributeIds.includes(attribute.name)) {
+      return true;
+    }
+
+    return false;
+  });
+
+  return [companyAttrs, generalAttrs];
 }

client/src/lib/search.js

@@ -66,6 +66,10 @@ function useProvideSearch() {
     setPopupShown(true);
   };
 
+  const setFilter = (id, filter) => {
+    return (filters[id] = filter);
+  };
+
   const getAttributeId = (filter) => {
     return filters[filter].id;
   };
@@ -136,6 +140,7 @@ function useProvideSearch() {
     popupShown,
     showPopup,
     filters,
+    setFilter,
     setFilters,
     getAttributeId,
     isFilterActive,

client/src/pages/Search/Global.jsx

@@ -9,7 +9,7 @@ import Pagination from "../../components/Pagination";
 
 import * as helper from "./helper";
 import { useAuth0 } from "../../react-auth0-spa";
-import { getCompanyAttributes } from "../../lib/company-attributes";
+import { getAttributes } from "../../lib/company-attributes";
 import { useSearch, FILTERS } from "../../lib/search";
 import { makeColorIterator, avatarColors } from "../../lib/colors";
 import config from "../../config";
@@ -104,7 +104,7 @@ export default function SearchGlobal({ keyword }) {
     let isSubscribed = true;
 
     (async () => {
-      const companyAttrs = await getCompanyAttributes(
+      const [companyAttrs, generalAttrs] = await getAttributes(
         apiClient,
         cancelTokenSource.token
       );
@@ -116,15 +116,23 @@ export default function SearchGlobal({ keyword }) {
             group: "Company attributes",
             active: false,
           };
-          if (companyAttr.name === config.STANDARD_USER_ATTRIBUTES.location) {
-            filtersWithCompanyAttrs[FILTERS.LOCATIONS].id = companyAttr.id;
-          }
         });
 
         if (isSubscribed) {
           searchContext.setFilters(filtersWithCompanyAttrs);
         }
       }
+      if (generalAttrs) {
+        generalAttrs.forEach((generalAttr) => {
+          if (generalAttr.name === config.STANDARD_USER_ATTRIBUTES.location) {
+            filtersWithCompanyAttrs[FILTERS.LOCATIONS].id = generalAttr.id;
+            searchContext.setFilter(
+              FILTERS.LOCATIONS,
+              filtersWithCompanyAttrs[FILTERS.LOCATIONS]
+            );
+          }
+        });
+      }
     })();
 
     return () => {