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

Timestamp:

02/20/14 16:09:24 (10 years ago)

Author:

twagoo

Message:

Added a panel for facets with selected valeus that allow for deselection. FacetsPanel? adds either an instance of this or of the value select panel depending on whether an existing selection is present.

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/FacetsPanel.java (modified) (4 diffs)

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.components;
 
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldsDataProvider;
 import java.util.Collection;
+import java.util.HashSet;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -27 +29 @@
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
 /**
- * A panel representing a group of facets
+ * A panel representing a group of facets.
+ *
+ * For each facet present (retrieved from the injected
+ * {@link FacetFieldsService}, a panel is added. This is either a
+ * {@link FacetValuesPanel}, allowing for selection of facet values, or a
+ * {@link SelectedFacetPanel} representing a facet with selected values,
+ * allowing for deselection of these values.
  *
  * @author twagoo
@@ -38 +47 @@
     @SpringBean
     private FacetFieldsService facetFieldsService;
+    private final IModel<QueryFacetsSelection> model;
 
-    public FacetsPanel(final String id, final IModel<QueryFacetsSelection> model) {
+    public FacetsPanel(final String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
+        this.model = model;
 
         add(new DataView<FacetField>("facets", new FacetFieldsDataProvider(facetFieldsService, model)) {
@@ -46 +57 @@
             @Override
             protected void populateItem(Item<FacetField> item) {
-                item.add(new FacetValuesPanel("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());
-                        }
-                    }
-                });
+                createFacetPanel(item);
             }
         });
     }
 
+    private void createFacetPanel(Item<FacetField> item) {
+        // Is there a selection for this facet?
+        final IModel<FacetField> facetFieldModel = item.getModel();
+        final String facetName = facetFieldModel.getObject().getName();
+        final Collection<String> selectionValues = model.getObject().getSelectionValues(facetName);
+
+        // Show different panel, depending on selected values
+        if (selectionValues == null || selectionValues.isEmpty()) {
+            // No values selected, show value selection panel
+            item.add(createFacetValuesPanel(facetFieldModel));
+        } else {
+            // Values selected, show selected values panel (with option to remove)
+            item.add(createSelectedFacetPanel(facetName));
+        }
+    }
+
+    private FacetValuesPanel createFacetValuesPanel(final IModel<FacetField> facetFieldModel) {
+        return new FacetValuesPanel("facet", facetFieldModel) {
+
+            @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);
+
+                if (target != null) {
+                    // reload entire page for now
+                    target.add(getPage());
+                }
+            }
+        };
+    }
+
+    private SelectedFacetPanel createSelectedFacetPanel(String facetName) {
+        final FacetSelection selection = new FacetSelection(facetName, model);
+        return new SelectedFacetPanel("facet", new Model(selection)) {
+
+            @Override
+            public void onValuesUnselected(String facet, Collection<String> valuesRemoved, AjaxRequestTarget target) {
+                // Values have been removed, calculate remainder
+                final Collection<String> currentSelection = model.getObject().getSelectionValues(facet);
+                final Collection<String> newSelection = new HashSet<String>(currentSelection);
+                newSelection.removeAll(valuesRemoved);
+
+                // Update model
+                model.getObject().selectValues(facet, newSelection);
+
+                if (target != null) {
+                    // reload entire page for now
+                    target.add(getPage());
+                }
+            }
+        };
+    }
 }