Changeset 5461

Timestamp:

07/08/14 13:58:24 (10 years ago)

Author:

Twan Goosen

Message:

lazy loading of virtual collection form panel (only when 'create collection' action link is clicked)

Location:

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels

Files:

• VirtualCollectionFormPanel.html (modified) (2 diffs)
• VirtualCollectionFormPanel.java (modified) (4 diffs)
• search/AdvancedSearchOptionsPanel.html (modified) (1 diff)
• search/AdvancedSearchOptionsPanel.java (modified) (5 diffs)

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/VirtualCollectionFormPanel.html

@@ -32 +32 @@
         -->
         <wicket:panel>
-            <form id="contentSearchForm" wicket:id="vcrForm" method="post" name="vcrForm" target="_blank" action="[VCR endpoint]"> 
+            <form id="contentSearchForm" wicket:id="vcrForm" method="post" name="vcrForm" action="[VCR endpoint]"> 
                 <fieldset style="border:0px;"> 
                     <input type="hidden" name="type" value="EXTENSIONAL" />
@@ -40 +40 @@
                     </wicket:container>
                 </fieldset> 
+                <input type="submit" value="Create virtual collection" class="nonjsfallback" />
             </form> 
-            <a href="#" onclick="document.vcrForm.submit();">Create virtual collection from search results</a>
         </wicket:panel>
     </body>

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/VirtualCollectionFormPanel.java

@@ -19 +19 @@
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
 import eu.clarin.cmdi.vlo.wicket.provider.SolrDocumentProvider;
@@ -35 +34 @@
 /**
  * Panel that renders an HTML form with hidden fields to submits the results of
- * a query selection to the Virtual Collection Registry in order to create a
- * new collection
+ * a query selection to the Virtual Collection Registry in order to create a new
+ * collection
  *
  * @author twagoo
@@ -43 +42 @@
 
     //TODO: make configurable
-    private final int RESULTSET_SIZE_LIMIT = 10;
-    //TODO: make configurable
-    private final String vcrSubmitEndpoint = "http://localhost:8080/VirtualCollectionRegistry/service/submit";
-    private final IDataProvider<SolrDocument> documentProvider;
+    private final String vcrSubmitEndpoint = "http://catalog-clarin.esc.rzg.mpg.de/vcr/service/submit";
 
+    /**
+     * Construct the panel with a new document provider based on the provided
+     * model
+     *
+     * @param id component id
+     * @param model model to use for form content and document provider
+     */
     public VirtualCollectionFormPanel(String id, IModel<QueryFacetsSelection> model) {
+        this(id, model, new SolrDocumentProvider(model));
+    }
+
+    /**
+     * Constructs the panel with a shared document provider
+     *
+     * @param id component id
+     * @param model model to use for form content (collection title)
+     * @param documentProvider provider to use for gathering document ID's
+     * (assumed to be based on the same model as the one provided to this
+     * constructor)
+     */
+    public VirtualCollectionFormPanel(String id, IModel<QueryFacetsSelection> model, IDataProvider<SolrDocument> documentProvider) {
         super(id, model);
-
-        //TOOD: optionally get provider through constructor (so that it can be shared)
-        documentProvider = new SolrDocumentProvider(model);
 
         final WebMarkupContainer form = new WebMarkupContainer("vcrForm");
@@ -91 +104 @@
     }
 
-    @Override
-    protected void onConfigure() {
-        super.onConfigure();
-        setVisible(documentProvider.size() < RESULTSET_SIZE_LIMIT);
-    }
-
 }

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.html

@@ -34 +34 @@
                     <input type="submit" value="Apply" class="nonjsfallback" />
                 </form>
-                <div wicket:id="vcrForm" id="vcrsubmit">
-                    [VCR submit form]
+                <div wicket:id="vcrSubmit" id="vcrsubmit">
+                    <a wicket:id="vcrSubmitTrigger">Create virtual collection from search results</a>
+                    <div wicket:id="vcrForm">
+                        [VCR submit form]
+                    </div>
                 </div>
             </div>

vlo/branches/vlo-3.1-vcr/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.java

@@ -28 +28 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.CheckBox;
@@ -43 +45 @@
  */
 public abstract class AdvancedSearchOptionsPanel extends ExpandablePanel<QueryFacetsSelection> {
-
+    
     public AdvancedSearchOptionsPanel(String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
@@ -51 +53 @@
         // wrap in a toggle model that allows switching between a null selection and a 'not empty' selection
         final ToggleModel<FacetSelection> toggleModel = new ToggleModel<FacetSelection>(fcsFacetModel, null, new FacetSelection(FacetSelectionType.NOT_EMPTY));
-
+        
         final Form options = new Form("options");
         final CheckBox fcsCheck = new CheckBox("fcs", toggleModel);
         fcsCheck.add(new OnChangeAjaxBehavior() {
-
+            
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
@@ -64 +66 @@
         add(options);
         
-        //TODO: lazy rendering of form, it can be large. I.e. provide a link
-        //that makes form 'visible', and then tries to auto submit
-        add(new VirtualCollectionFormPanel("vcrForm", model));
+        final WebMarkupContainer vcrSubmit = new WebMarkupContainer("vcrSubmit");
+        vcrSubmit.setOutputMarkupId(true);
+        add(vcrSubmit);
+        
+        final VirtualCollectionFormPanel vcrSubmitForm = new VirtualCollectionFormPanel("vcrForm", model);
+        vcrSubmitForm.setVisible(false);
+        vcrSubmit.add(vcrSubmitForm);
+        
+        vcrSubmit.add(new AjaxFallbackLink("vcrSubmitTrigger") {
+            
+            @Override
+            public void onClick(AjaxRequestTarget target) {
+                vcrSubmitForm.setVisible(true);
+                if (target != null) {
+                    target.add(vcrSubmit);
+                    // after update, submit the form to the VCR
+                    target.appendJavaScript("document.vcrForm.submit();");
+                }
+            }
+        });
 
         // should initially be epxanded if one of the options was selected
@@ -73 +92 @@
         }
     }
-
+    
     @Override
     protected Label createTitleLabel(String id) {
         return new Label(id, "Search options");
     }
-
+    
     protected abstract void selectionChanged(AjaxRequestTarget target);
-
+    
 }