changes for #15

client/src/components/FiltersSideMenu/filters.js

@@ -134,7 +134,9 @@ export default function SearchTabFilters({ achievements }) {
   };
 
   const addLocationToFilter = (location) => {
-    const locationFilters = JSON.parse(JSON.stringify(search.selectedLocations));
+    const locationFilters = JSON.parse(
+      JSON.stringify(search.selectedLocations)
+    );
 
     if (locationFilters.findIndex((s) => s.id === location.id) !== -1) {
       return;
@@ -144,7 +146,9 @@ export default function SearchTabFilters({ achievements }) {
   };
 
   const removeLocationFromFilter = (location) => {
-    const locationFilters = JSON.parse(JSON.stringify(search.selectedLocations));
+    const locationFilters = JSON.parse(
+      JSON.stringify(search.selectedLocations)
+    );
     const index = locationFilters.findIndex((s) => s.id === location.id);
 
     if (index === -1) {
@@ -256,7 +260,7 @@ export default function SearchTabFilters({ achievements }) {
               placeholder={"Search for a location"}
               onSelect={addLocationToFilter}
               purpose="locations"
-              companyAttrId={config.STANDARD_USER_ATTRIBUTES.location}
+              companyAttrId={search.getAttributeId(FILTERS.LOCATIONS)}
             />
             {search.selectedLocations.length > 0 && (
               <div className={utilityStyles.mt16}>

client/src/components/SuggestionBox/index.jsx

@@ -4,6 +4,7 @@ import config from "../../config";
 import api from "../../services/api";
 import style from "./style.module.scss";
 import _ from "lodash";
+import { useSearch, FILTERS } from "../../lib/search";
 
 const NO_RESULTS_FOUND = "no results found";
 const DELAY_SEARCH = 300;
@@ -95,13 +96,19 @@ export default function SuggestionBox({
   placeholder,
   onSelect,
 }) {
+  const search = useSearch();
   const apiClient = api();
   const [suggestions, setSuggestions] = React.useState([]);
   const [value, setValue] = React.useState("");
 
   const onChange = (event, { newValue }) => setValue(newValue.trim());
 
   const onSuggestionsFetchRequested = async ({ value }) => {
+    if (purpose === "locations") {
+      if (!companyAttrId) {
+        companyAttrId = search.getAttributeId(FILTERS.LOCATIONS);
+      }
+    }
     if (purpose === "skills") {
       let data = await getSkillsSuggestions(apiClient, value);
 

client/src/config.js

@@ -37,4 +37,7 @@ export default {
     clientId: process.env.REACT_APP_AUTH0_CLIENTID,
     audience: process.env.REACT_APP_AUTH0_AUDIENCE,
   },
+
+  REACT_APP_ATTRIBUTE_ID_LOCATION:
+    process.env.REACT_APP_ATTRIBUTE_ID_LOCATION || "location",
 };

client/src/lib/search.js

@@ -66,6 +66,10 @@ function useProvideSearch() {
     setPopupShown(true);
   };
 
+  const getAttributeId = (filter) => {
+    return filters[filter].id;
+  };
+
   const isFilterActive = (filter) => {
     return filters[filter].active;
   };
@@ -133,6 +137,7 @@ function useProvideSearch() {
     showPopup,
     filters,
     setFilters,
+    getAttributeId,
     isFilterActive,
     activateFilter,
     deactivateFilter,

client/src/pages/Search/Global.jsx

@@ -116,6 +116,9 @@ export default function SearchGlobal({ keyword }) {
             group: "Company attributes",
             active: false,
           };
+          if (companyAttr.name === config.REACT_APP_ATTRIBUTE_ID_LOCATION) {
+            filtersWithCompanyAttrs[FILTERS.LOCATIONS].id = companyAttr.id;
+          }
         });
 
         if (isSubscribed) {
@@ -206,10 +209,12 @@ export default function SearchGlobal({ keyword }) {
       pageChanged = true;
     }
 
-    if (_.isEqual(prevCriteria, criteria)
-      && prevKeyword === keyword
-      && prevOrderBy === orderBy
-      && pageChanged === false) {
+    if (
+      _.isEqual(prevCriteria, criteria) &&
+      prevKeyword === keyword &&
+      prevOrderBy === orderBy &&
+      pageChanged === false
+    ) {
       return;
     } else {
       setPrevCriteria(criteria);