Merge pull request Marklogic-retired#207 in PROD/explorer-ui from ~SV…

…ISHAKA/explorer-ui:DHFPROD-4259 to develop * commit 'db9aa6fc0a4d3487895e3556f3d9f7d799c64838': removed extra for loop duplicate facets fix
brucean52 · Jan 31, 2020 · 22b7854 · 22b7854
2 parents e85e99f + db9aa6f
commit 22b7854
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/components/facet/facet.tsx b/src/components/facet/facet.tsx
@@ -63,9 +63,12 @@ const Facet: React.FC<Props> = (props) => {
 
   const checkFacetValues = (checkedValues) => {
     let updatedChecked = [...checked];
-    props.addFacetValues(props.constraint, checkedValues, props.facetType, props.facetCategory);
-    updatedChecked.push(...checkedValues);
+    for(let value of checkedValues){
+      if(updatedChecked.indexOf(value) === -1)
+        updatedChecked.push(value);
+    }
     setChecked(updatedChecked);
+    props.addFacetValues(props.constraint, updatedChecked, props.facetType, props.facetCategory);
     toggleApply(true);
   }
 
@@ -165,7 +168,7 @@ const Facet: React.FC<Props> = (props) => {
           onClick={() => showMore()}
           data-cy="show-more"
         >{(more) ? '<< less' : 'more >>'}</div>
-        {props.facetType === 'xs:string' &&
+        {props.facetType === 'xs:string' && props.facetValues.length >= 25 &&
         <div className={styles.searchValues}>
           <PopOverSearch
               name={props.name}

diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
@@ -164,8 +164,6 @@ const Sidebar: React.FC<Props> = (props) => {
         let additionalFacetVals = vals.map(item => {
           return { name: item, count: 0, value: item }
         });
-
-        if (!newAllSelectedfacets.hasOwnProperty(constraint)) {
           // facet value doesn't exist
           newAllSelectedfacets = {
             ...newAllSelectedfacets,
@@ -174,14 +172,15 @@ const Sidebar: React.FC<Props> = (props) => {
               [valueKey]: vals
             }
           }
-          // TODO duplicate facet is added if additional facet vals contains
-          // existing value
-          newEntityFacets[index]['facetValues'].unshift(...additionalFacetVals);
-        } else {
-          // add facet vals to selected facet
-          newAllSelectedfacets[constraint][valueKey].push(...vals)
+        for (let i = 0; i < additionalFacetVals.length; i++) {
+          for (let j = 0; j < newEntityFacets[index]['facetValues'].length; j++) {
+            if (additionalFacetVals[i].name === newEntityFacets[index]['facetValues'][j].name) {
+              newEntityFacets[index]['facetValues'].splice(j, 1);
+              break;
+            }
+          }
+            newEntityFacets[index]['facetValues'].unshift(additionalFacetVals[i]);
         }
-
       }
       setEntityFacets(newEntityFacets);
     } else if (facetCategory === 'hub') {