Merge pull request #587 from topcoder-platform/issue-386

issue 386 fix

Author: callmekatootie

client/src/components/editFiltersPopup/index.js

@@ -65,8 +65,43 @@ export default function EditFiltersPopup({ onCancel, onDone }) {
       onDone(selectedFilters);
     }
     search.setFilters(searchFilters);
+    removeDataFromDisabledFilters(searchFilters)
   };
 
+  const removeDataFromDisabledFilters = (searchFilters) => {
+    const companyAttrIdsToBeRemoved = []
+    for (const [key, value] of Object.entries(searchFilters)) {
+      if(value.group === "General attributes") {
+        if(!value.active) {
+          removeGeneralAttr(value.text);
+        }
+      } else {
+        if(!value.active) {
+          companyAttrIdsToBeRemoved.push(key);
+        }
+      }
+    }
+    search.clearSelectCompanyAttributes(companyAttrIdsToBeRemoved)
+  }
+
+  const removeGeneralAttr = (text) => {
+    if (text === "Location") {
+      search.selectLocations([])
+    }
+    if (text === "Skills") {
+      search.selectSkills([])
+    }
+    if (text === "Achievements") {
+      search.selectAchievements([])
+    }
+    if (text === "Availability") {
+      search.selectAvailability({
+        isAvailableSelected: false,
+        isUnavailableSelected: false
+      })
+    }
+  }
+
   const handleFilterValueChanged = (filter, newValue) => {
     var index = selectedFilters.indexOf(filter);
     if (newValue) {

client/src/lib/search.js

@@ -94,6 +94,14 @@ function useProvideSearch() {
     });
   };
 
+  const clearSelectCompanyAttributes = (ids) => {
+    const selectedCmpAttr = {...selectedCompanyAttributes};
+    for (let id of ids) {
+      selectedCmpAttr[id] = [];
+    }
+    setSelectedCompanyAttributes(selectedCmpAttr)
+  }
+
   const getCompanyAttrActiveFilter = () => {
     const companyAttrActiveFilters = [];
     for (const filter in filters) {
@@ -120,6 +128,7 @@ function useProvideSearch() {
     selectAvailability: setSelectedAvailability,
     selectedCompanyAttributes,
     selectCompanyAttributes: setSelectedCompanyAttributes,
+    clearSelectCompanyAttributes,
     popupShown,
     showPopup,
     filters,