Changeset 6228

Timestamp:

05/19/15 12:10:09 (9 years ago)

Author:

Twan Goosen

Message:

Added removal link for the query to the breadcrumbs panel
Fixes #619

Location:

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• pages/FacetedSearchPage.java (modified) (5 diffs)
• panels/BreadCrumbPanel.html (modified) (1 diff)
• panels/BreadCrumbPanel.java (modified) (14 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

@@ -47 +47 @@
     private Component collectionsPanel;
     private Component navigation;
+    private Component searchForm;
 
     public FacetedSearchPage(IModel<QueryFacetsSelection> queryModel) {
@@ -65 +66 @@
         navigation = createNavigation("navigation");
         add(navigation);
-
-        add(createSearchForm("search"));
+        
+        searchForm = createSearchForm("search");
+        add(searchForm);
 
         collectionsPanel = createCollectionsPanel("collections");
@@ -118 +120 @@
 
     private SearchForm createSearchForm(String id) {
-        final SearchForm searchForm = new SearchForm(id, getModel()) {
+        final SearchForm form = new SearchForm(id, getModel()) {
 
             @Override
@@ -128 +130 @@
 
         };
-        return searchForm;
+        form.setOutputMarkupId(true);
+        return form;
     }
 
@@ -172 +175 @@
         if (target != null) { // null if JavaScript disabled
             target.add(navigation);
+            target.add(searchForm);
             target.add(searchResultsPanel);
             target.add(facetsPanel);

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/BreadCrumbPanel.html

@@ -30 +30 @@
             <wicket:container wicket:id="query">
                 &gt; <a wicket:id="leavequery">Search: &quot;<span wicket:id="content"></span>&quot;</a>
+                <a wicket:id="removal" title="Remove query" class="breadcrumbunselect"><span>[Remove]</span></a>
             </wicket:container>
             <wicket:container wicket:id="facets">
                 &gt; <a wicket:id="leaveselection">Selections</a>: 
                 <wicket:container wicket:id="facet">
-                    <span class="breadcrumbfacet"><wicket:container wicket:id="value">[VALUE]</wicket:container> <a wicket:id="removal" title="Remove selection" class="breadcrumbunselect"><span>[Remove]</span></a></span>
+                    <span class="breadcrumbfacet"><wicket:container wicket:id="value">[VALUE]</wicket:container>
+                        <a wicket:id="removal" title="Remove selection" class="breadcrumbunselect"><span>[Remove]</span></a></span>
                 </wicket:container>
             </wicket:container>

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/BreadCrumbPanel.java

@@ -53 +53 @@
  */
 public class BreadCrumbPanel extends GenericPanel<QueryFacetsSelection> {
-    
+
     @SpringBean(name = "queryParametersConverter")
     private PageParametersConverter<QueryFacetsSelection> paramsConverter;
     @SpringBean
     private FieldValueConverterProvider fieldValueConverterProvider;
-    
+
     private final WebMarkupContainer query;
     private final WebMarkupContainer facets;
-    
+
     public BreadCrumbPanel(String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
@@ -68 +68 @@
         add(facets = createFacets(model, "facets"));
     }
-    
+
     private WebMarkupContainer createQuery(final IModel<QueryFacetsSelection> selectionModel, String id) {
         final WebMarkupContainer queryContainer = new WebMarkupContainer(id);
         final Link link = new AjaxFallbackLink("leavequery") {
-            
+
             @Override
             public void onClick(AjaxRequestTarget target) {
@@ -82 +82 @@
         link.add(new Label("content", new PropertyModel(selectionModel, "query")));
         queryContainer.add(link);
+
+        queryContainer.add(new AjaxFallbackLink("removal") {
+
+            @Override
+            public void onClick(AjaxRequestTarget target) {
+                // get a copy of the current selection
+                final QueryFacetsSelection newSelection = selectionModel.getObject().getCopy();
+                newSelection.setQuery(null);
+                onSelectionChanged(newSelection, target);
+            }
+        });
         return queryContainer;
     }
-    
+
     private WebMarkupContainer createFacets(final IModel<QueryFacetsSelection> model, String id) {
         final WebMarkupContainer facetsContainer = new WebMarkupContainer(id);
         facetsContainer.add(new AjaxFallbackLink("leaveselection") {
-            
+
             @Override
             public void onClick(AjaxRequestTarget target) {
@@ -98 +109 @@
         final FacetSelectionProvider facetSelectionProvider = new FacetSelectionProvider(model);
         facetsContainer.add(new DataView<Map.Entry<String, FacetSelection>>("facet", facetSelectionProvider) {
-            
+
             @Override
             protected void populateItem(final Item<Map.Entry<String, FacetSelection>> item) {
@@ -104 +115 @@
                 // add a label for the selected facet value(s)
                 final Label valueLabel = new Label("value", new PropertyModel(selectionModel, "value")) {
-                    
+
                     @Override
                     public <C> IConverter<C> getConverter(Class<C> type) {
@@ -111 +122 @@
                         return (IConverter<C>) new SelectionConverter(facet, fieldValueConverterProvider.getConverter(facet));
                     }
-                    
+
                 };
                 // add facet name as title attribute so that it becomes available through a tooltip
@@ -120 +131 @@
                 // add a link for removal of the facet value selection
                 item.add(new AjaxFallbackLink("removal") {
-                    
+
                     @Override
                     public void onClick(AjaxRequestTarget target) {
@@ -133 +144 @@
             }
         });
-        
+
         return facetsContainer;
     }
@@ -148 +159 @@
         setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(selection));
     }
-    
+
     @Override
     protected void onConfigure() {
         super.onConfigure();
-        
+
         final String queryString = getModelObject().getQuery();
         final Map<String, FacetSelection> selection = getModelObject().getSelection();
-        
+
         query.setVisible(queryString != null && !queryString.isEmpty());
         facets.setVisible(selection != null && !selection.isEmpty());
@@ -165 +176 @@
      */
     private class SelectionConverter implements IConverter<FacetSelection> {
-        
+
         private final String facet;
         private final IConverter<String> valueConverter;
-        
+
         public SelectionConverter(String facet, IConverter<String> valueConverter) {
             this.facet = facet;
             this.valueConverter = valueConverter;
         }
-        
+
         @Override
         public FacetSelection convertToObject(String value, Locale locale) throws ConversionException {
             throw new UnsupportedOperationException("Not supported yet.");
         }
-        
+
         @Override
         public String convertToString(FacetSelection selection, Locale locale) {
@@ -193 +204 @@
                     return facet;
             }
-            
-        }
-        
+
+        }
+
         private String getAnyValueString() {
             if (FacetConstants.FIELD_SEARCH_SERVICE.equals(facet)) {
@@ -202 +213 @@
             return "any " + facet;
         }
-        
+
         public String getCollectionString(FacetSelection selection, String valueSeparator, Locale locale) {
             final Collection<String> value = selection.getValues();
@@ -219 +230 @@
             }
         }
-        
+
         private String getConvertedValue(String string, Locale locale) {
             if (valueConverter != null) {
@@ -229 +240 @@
             return string;
         }
-        
+
     };
 }