Changeset 4526

Timestamp:

02/17/14 14:33:27 (10 years ago)

Author:

twagoo

Message:

added callback to facetpanel for value selection

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo

Files:

• pojo/QueryFacetsSelection.java (modified) (1 diff)
• wicket/components/FacetPanel.java (modified) (5 diffs)
• wicket/components/FacetsPanel.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/QueryFacetsSelection.java

@@ -91 +91 @@
         return queryString;
     }
+    
+    public void selectValues(String facet, Collection<String> values){
+        selection.put(facet, values);
+    }
 
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetPanel.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldValuesProvider;
+import java.util.Collection;
+import java.util.Collections;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.client.solrj.response.FacetField.Count;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.Link;
@@ -33 +37 @@
  * @author twagoo
  */
-public class FacetPanel extends Panel {
+public abstract class FacetPanel extends Panel {
 
     private final int maxNumberOfFacetsToShow = 10; //TODO: get from config
-    
+
     public FacetPanel(String id, IModel<FacetField> model) {
         super(id, model);
@@ -43 +47 @@
         // 'name' field from FacetField
         add(new Label("name"));
-        
+
         // provider that extracts values and counts from FacetField
         final FacetFieldValuesProvider valuesProvider = new FacetFieldValuesProvider(model, maxNumberOfFacetsToShow);
@@ -49 +53 @@
 
             @Override
-            protected void populateItem(Item<Count> item) {
+            protected void populateItem(final Item<Count> item) {
                 item.setDefaultModel(new CompoundPropertyModel<Count>(item.getModel()));
-                final Link selectLink = new Link("facetSelect") {
-                    
+                final Link selectLink = new AjaxFallbackLink("facetSelect") {
+
                     @Override
-                    public void onClick() {
-                        //TODO: select facet
-                        throw new UnsupportedOperationException("Not supported yet.");
+                    public void onClick(AjaxRequestTarget target) {
+                        FacetPanel.this.onValuesSelected(
+                                item.getModelObject().getFacetField().getName(),
+                                Collections.singleton(item.getModelObject().getName()),
+                                target);
                     }
                 };
@@ -68 +74 @@
     }
 
+    /**
+     * Callback triggered when values have been selected on this facet
+     *
+     * @param facet name of the facet this panel represents
+     * @param values selected values
+     * @param target Ajax target allowing for a partial update. May be null
+     * (fallback)!
+     */
+    public abstract void onValuesSelected(String facet, Collection<String> values, AjaxRequestTarget target);
+
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetsPanel.java

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldsDataProvider;
+import java.util.Collection;
 import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.repeater.Item;
@@ -37 +39 @@
     private FacetFieldsService facetFieldsService;
 
-    public FacetsPanel(String id, IModel<QueryFacetsSelection> model) {
+    public FacetsPanel(final String id, final IModel<QueryFacetsSelection> model) {
         super(id, model);
-        add(new FacetsDataView("facets", model));
+
+        add(new DataView<FacetField>("facets", new FacetFieldsDataProvider(facetFieldsService, model)) {
+
+            @Override
+            protected void populateItem(Item<FacetField> item) {
+                item.add(new FacetPanel("facet", item.getModel()) {
+
+                    @Override
+                    public void onValuesSelected(String facet, Collection<String> value, AjaxRequestTarget target) {
+                        // A value has been selected on this facet's panel,
+                        // update the model! 
+                        model.getObject().selectValues(facet, value);
+
+                        // Trigger updates to reflect new model state
+                        modelChanged();
+
+                        if (target != null) {
+                            // reload entire page for now
+                            target.add(getPage());
+                        }
+                    }
+                });
+            }
+        });
     }
 
-    private class FacetsDataView extends DataView<FacetField> {
-
-        public FacetsDataView(String id, IModel<QueryFacetsSelection> model) {
-            super(id, new FacetFieldsDataProvider(facetFieldsService, model));
-        }
-
-        @Override
-        protected void populateItem(Item<FacetField> item) {
-            item.add(new FacetPanel("facet", item.getModel()));
-        }
-    }
 }