Changeset 5031

Timestamp:

04/23/14 15:31:38 (10 years ago)

Author:

Twan Goosen

Message:

ajax updates (with fallback) from selections/removals in breadcrumb panel in faceted search page

Location:

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

Files:

• pages/FacetedSearchPage.java (modified) (2 diffs)
• panels/BreadCrumbPanel.java (modified) (7 diffs)

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

@@ -61 +61 @@
 
     private void addComponents() {
-        navigation = new WebMarkupContainer("navigation");
-        navigation.setOutputMarkupId(true);
+        navigation = createNavigation("navigation");
         add(navigation);
-
-        navigation.add(new BreadCrumbPanel("breadcrumbs", getModel()));
-        navigation.add(new TopLinksPanel("permalink", getModel()) {
-
-            @Override
-            protected void onChange(AjaxRequestTarget target) {
-                if (target != null) {
-                    target.add(navigation);
-                }
-            }
-
-        });
 
         add(createSearchForm("search"));
@@ -92 +79 @@
     }
 
-    public Panel createOptionsPanel(String id) {
+    private WebMarkupContainer createNavigation(String id) {
+        final WebMarkupContainer container = new WebMarkupContainer(id);
+        container.setOutputMarkupId(true);
+        container.add(new BreadCrumbPanel("breadcrumbs", getModel()){
+
+            @Override
+            protected void onSelectionChanged(QueryFacetsSelection selection, AjaxRequestTarget target) {
+                setModelObject(selection);
+                updateSelection(target);
+            }
+            
+        });
+        container.add(new TopLinksPanel("permalink", getModel()) {
+
+            @Override
+            protected void onChange(AjaxRequestTarget target) {
+                if (target != null) {
+                    target.add(container);
+                }
+            }
+
+        });
+        return container;
+    }
+
+    private Panel createOptionsPanel(String id) {
         final Panel optionsPanel = new AdvancedSearchOptionsPanel(id, getModel()) {
 

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

@@ -29 +29 @@
 import java.util.Map;
 import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -51 +53 @@
 public class BreadCrumbPanel extends GenericPanel<QueryFacetsSelection> {
 
-    @SpringBean(name="queryParametersConverter")
+    @SpringBean(name = "queryParametersConverter")
     private PageParametersConverter<QueryFacetsSelection> paramsConverter;
 
@@ -66 +68 @@
     private WebMarkupContainer createQuery(final IModel<QueryFacetsSelection> selectionModel, String id) {
         final WebMarkupContainer queryContainer = new WebMarkupContainer(id);
-        final Link link = new Link("leavequery") {
+        final Link link = new AjaxFallbackLink("leavequery") {
 
             @Override
-            public void onClick() {
+            public void onClick(AjaxRequestTarget target) {
                 // make query object without selection
                 final QueryFacetsSelection newSelection = new QueryFacetsSelection(selectionModel.getObject().getQuery(), null);
-                setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(newSelection));
+                onSelectionChanged(newSelection, target);
             }
         };
@@ -82 +84 @@
     private WebMarkupContainer createFacets(final IModel<QueryFacetsSelection> model, String id) {
         final WebMarkupContainer facetsContainer = new WebMarkupContainer(id);
-        facetsContainer.add(new Link("leaveselection") {
+        facetsContainer.add(new AjaxFallbackLink("leaveselection") {
 
             @Override
-            public void onClick() {
-                setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(model.getObject()));
+            public void onClick(AjaxRequestTarget target) {
+                onSelectionChanged(model.getObject(), target);
             }
         });
@@ -113 +115 @@
 
                 // add a link for removal of the facet value selection
-                item.add(new Link("removal") {
+                item.add(new AjaxFallbackLink("removal") {
 
                     @Override
-                    public void onClick() {
+                    public void onClick(AjaxRequestTarget target) {
                         // get a copy of the current selection
                         final QueryFacetsSelection newSelection = model.getObject().getCopy();
@@ -122 +124 @@
                         // unselect this facet
                         newSelection.selectValues(facet, null);
-                        setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(newSelection));
+                        onSelectionChanged(newSelection, target);
                     }
                 });
@@ -129 +131 @@
 
         return facetsContainer;
+    }
+
+    /**
+     * Gets called if one of the links is clicked and the selection is changed.
+     * This implementation sets the response page to {@link FacetedSearchPage}
+     * with the new selection as its parameters
+     *
+     * @param selection new selection
+     * @param target AJAX target, may be null
+     */
+    protected void onSelectionChanged(QueryFacetsSelection selection, AjaxRequestTarget target) {
+        setResponsePage(FacetedSearchPage.class, paramsConverter.toParameters(selection));
     }