6641 search ui bug

src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java

@@ -2,7 +2,6 @@
 
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.DataFileTag;
 import edu.harvard.iq.dataverse.DataTable;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetFieldType;
@@ -21,34 +20,22 @@
 import edu.harvard.iq.dataverse.SettingsWrapper;
 import edu.harvard.iq.dataverse.ThumbnailServiceWrapper;
 import edu.harvard.iq.dataverse.WidgetWrapper;
-import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter;
-import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
-import edu.harvard.iq.dataverse.dataset.DatasetUtil;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.faces.context.FacesContext;
-import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.servlet.http.HttpServletRequest;
@@ -268,18 +255,20 @@ public void search(boolean onlyDataRelatedToMe) {
                 selectedTypesString = "dataverses:datasets:files";
             }
         }
-
+        
         filterQueries = new ArrayList<>();
         for (String fq : Arrays.asList(fq0, fq1, fq2, fq3, fq4, fq5, fq6, fq7, fq8, fq9)) {
             if (fq != null) {
-                filterQueries.add(fq);
+                if (!isfilterQueryAlreadyInMap(fq)) {
+                    filterQueries.add(fq);
+                }
             }
         }
 
         SolrQueryResponse solrQueryResponse = null;
 
         List<String> filterQueriesFinal = new ArrayList<>();
-
+        
         if (dataverseAlias != null) {
             this.dataverse = dataverseService.findByAlias(dataverseAlias);
         }
@@ -291,7 +280,9 @@ public void search(boolean onlyDataRelatedToMe) {
                 /**
                  * @todo centralize this into SearchServiceBean
                  */
-                filterQueriesFinal.add(filterDownToSubtree);
+                if (!isfilterQueryAlreadyInMap(filterDownToSubtree)){
+                    filterQueriesFinal.add(filterDownToSubtree);
+                }
 //                this.dataverseSubtreeContext = dataversePath;
             } else {
 //                this.dataverseSubtreeContext = "all";
@@ -315,8 +306,11 @@ public void search(boolean onlyDataRelatedToMe) {
             typeFilterQuery = SearchFields.TYPE + ":(" + selectedTypesHumanReadable + ")";
         }
         filterQueriesFinal.addAll(filterQueries);
-        filterQueriesFinalAllTypes.addAll(filterQueriesFinal);
-        filterQueriesFinal.add(typeFilterQuery);
+        filterQueriesFinalAllTypes.addAll(filterQueriesFinal);       
+        if (!isfilterQueryAlreadyInMap(typeFilterQuery)) {
+            filterQueriesFinal.add(typeFilterQuery);
+        }
+
         String allTypesFilterQuery = SearchFields.TYPE + ":(dataverses OR datasets OR files)";
         filterQueriesFinalAllTypes.add(allTypesFilterQuery);
 
@@ -475,9 +469,7 @@ public void search(boolean onlyDataRelatedToMe) {
                     }
                 }
             }
-
-
-
+
             dataversePage.setQuery(query);
             dataversePage.setFacetCategoryList(facetCategoryList);
             dataversePage.setFilterQueries(filterQueriesFinal);
@@ -509,6 +501,25 @@ public void search(boolean onlyDataRelatedToMe) {
 //        friendlyName.put(SearchFields.PRODUCTION_DATE_YEAR_ONLY, "Production Date");
 //        friendlyName.put(SearchFields.DISTRIBUTION_DATE_YEAR_ONLY, "Distribution Date");
     }
+
+    private Map<String, Integer> fqMap = null;
+
+    private boolean isfilterQueryAlreadyInMap(String fq) {
+
+        if (fqMap == null) {
+            fqMap = new HashMap<>();
+            fqMap.put(fq, 1);
+            return false;
+        }
+
+        if (fqMap.get(fq) != null) {
+            return true;
+        } else {
+            fqMap.put(fq, 1);
+            return false;
+        }
+
+    }
 
 
     /**
@@ -1083,6 +1094,22 @@ public boolean hasValidFilterQueries(){
         return true;
     }
 
+    public String getTypeFromFilterQuery(String filterQuery) {
+
+        if (filterQuery == null) {
+            return null;
+        }
+
+        String[] parts = filterQuery.split(":");
+
+        if (parts.length != 2) {
+            //Filter query must has 2 parts delimited by a :
+            return null;
+        } else {
+            return parts[0];
+        }
+    }
+
     public List<String> getFriendlyNamesFromFilterQuery(String filterQuery) {
 
 
@@ -1129,6 +1156,7 @@ public List<String> getFriendlyNamesFromFilterQuery(String filterQuery) {
         friendlyNames.add(valueWithoutQuotes);
         return friendlyNames;
     }
+
 
     public String getNewSelectedTypes(String typeClicked) {
         List<String> newTypesSelected = new ArrayList<>();

src/main/webapp/search-include-fragment.xhtml

@@ -338,7 +338,9 @@
 
                 <ui:repeat value="#{SearchIncludeFragment.filterQueries}" var="filterQuery" rendered="#{!SearchIncludeFragment.wasSolrErrorEncountered()}">
                     <ui:param name="friendlyNames" value="#{SearchIncludeFragment.getFriendlyNamesFromFilterQuery(filterQuery)}"/>
-                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" styleClass="facetLink facetSelected" rendered="#{not empty friendlyNames}">
+                    <ui:param name="filterType" value="#{SearchIncludeFragment.getTypeFromFilterQuery(filterQuery)}"/>
+                    <h:outputLink value="#{widgetWrapper.wrapURL(page)}" styleClass="facetLink facetSelected" rendered="#{not empty friendlyNames
+                                and filterType != DataversePage.searchFieldType and filterType != DataversePage.searchFieldSubtree}">
                         <h:outputText value="#{friendlyNames.get(0)}: #{friendlyNames.get(1)}"/> <span class="glyphicon glyphicon-remove"></span>
                         <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                         <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">