Changeset 4599

Timestamp:

02/28/14 13:23:04 (10 years ago)

Author:

Twan Goosen

Message:

Ajax updating on facet value selection

Location:

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

Files:

• components/FacetPanel.java (modified) (5 diffs)
• components/FacetsPanel.java (modified) (3 diffs)
• pages/FacetedSearchPage.html (modified) (1 diff)
• pages/FacetedSearchPage.java (modified) (5 diffs)

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

@@ -23 +23 @@
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
@@ -36 +35 @@
  * @author twagoo
  */
-public class FacetPanel extends Panel {
+public abstract class FacetPanel extends Panel {
 
     private final IModel<FacetSelection> model;
@@ -74 +73 @@
                 if (target != null) {
                     // reload entire page for now
-                    target.add(getPage());
+                    selectionChanged(target);
                 }
             }
@@ -93 +92 @@
                 if (target != null) {
                     // reload entire page for now
-                    target.add(getPage());
+                    selectionChanged(target);
                 }
             }
@@ -99 +98 @@
     }
 
+    protected abstract void selectionChanged(AjaxRequestTarget target);
+
 }

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

@@ -21 +21 @@
 import java.util.List;
 import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -34 +35 @@
  * @author twagoo
  */
-public class FacetsPanel extends Panel {
+public abstract class FacetsPanel extends Panel {
 
     /**
@@ -52 +53 @@
             protected void populateItem(ListItem<FacetField> item) {
                 item.add(
-                        new FacetPanel("facet", new FacetSelectionModel(item.getModel(), selectionModel))
+                        new FacetPanel("facet", new FacetSelectionModel(item.getModel(), selectionModel)) {
+
+                            @Override
+                            protected void selectionChanged(AjaxRequestTarget target) {
+                                FacetsPanel.this.selectionChanged(target);
+                            }
+                        }
                 );
             }
         });
     }
+    
+    protected abstract void selectionChanged(AjaxRequestTarget target);
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.html

@@ -64 +64 @@
             <div class="facet collapsedfacet topbar" id="collections">
                 <div class="rtop"><div class="r1"></div><div class="r2"></div><div class="r3"></div><div class="r4"></div></div>
-                <wicket:container wicket:id="collectionsFacet">[COLLECTIONS]</wicket:container>
+                <div wicket:id="collectionsFacet">[COLLECTIONS]</div>
 <!--                <p>
                     Searching in all collections (604056 records).

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

@@ -15 +15 @@
 import java.util.Map;
 import org.apache.solr.client.solrj.response.FacetField;
-import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.markup.html.WebPage;
@@ -37 +37 @@
     private VloConfig vloConfig;
 
+    private final Panel searchResultsPanel;
+    private final Panel facetsPanel;
+    private final Panel collectionsPanel;
+
     public FacetedSearchPage(final PageParameters parameters) {
         super(parameters);
@@ -43 +47 @@
         final Model<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
 
-        add(createCollectionsPanel("collectionsFacet", queryModel));
-        add(createFacetsPanel("facets", queryModel));
-        
-        add(new SearchForm("search", queryModel));
-        add(new SearchResultsPanel("searchResults", queryModel));
+        final SearchForm searchForm = new SearchForm("search", queryModel);
+        add(searchForm);
+
+        collectionsPanel = createCollectionsPanel("collectionsFacet", queryModel);
+        add(collectionsPanel);
+
+        facetsPanel = createFacetsPanel("facets", queryModel);
+        add(facetsPanel);
+
+        searchResultsPanel = new SearchResultsPanel("searchResults", queryModel);
+        add(searchResultsPanel);
     }
 
@@ -53 +63 @@
         final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, vloConfig.getCollectionFacet(), queryModel);
         final FacetSelectionModel collectionSelectionModel = new FacetSelectionModel(collectionFacetFieldModel, queryModel);
-        final FacetPanel panel = new FacetPanel(id, collectionSelectionModel);
+        final FacetPanel panel = new FacetPanel(id, collectionSelectionModel) {
+
+            @Override
+            protected void selectionChanged(AjaxRequestTarget target) {
+                updateSelection(target);
+            }
+        };
+        panel.setOutputMarkupId(true);
         return panel;
     }
@@ -59 +76 @@
     private Panel createFacetsPanel(final String id, final Model<QueryFacetsSelection> queryModel) {
         final IModel<List<FacetField>> facetFieldsModel = new FacetFieldsModel(facetFieldsService, vloConfig.getFacetFields(), queryModel);
-        final FacetsPanel facetsPanel = new FacetsPanel(id, facetFieldsModel, queryModel);
-        return facetsPanel;
+        final FacetsPanel panel = new FacetsPanel(id, facetFieldsModel, queryModel) {
+
+            @Override
+            protected void selectionChanged(AjaxRequestTarget target) {
+                updateSelection(target);
+            }
+        };
+        panel.setOutputMarkupId(true);
+        return panel;
+    }
+
+    private void updateSelection(AjaxRequestTarget target) {
+        // selection changed, update facets and search results
+        target.add(searchResultsPanel);
+        target.add(facetsPanel);
+        target.add(collectionsPanel);
     }