Changeset 5544

Timestamp:

08/08/14 13:01:54 (10 years ago)

Author:

Twan Goosen

Message:

Added confirmation dialogue for case of pre-publication warnings
Preparing for #607

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry

Files:

• VirtualCollectionRegistryUsageException.java (modified) (2 diffs)
• gui/Application.properties (modified) (1 diff)
• gui/pages/BrowseEditableCollectionsPanel.html (modified) (1 diff)
• gui/pages/BrowseEditableCollectionsPanel.java (modified) (11 diffs)
• service/impl/VirtualCollectionPrePublicationValidator.java (added)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryUsageException.java

@@ -12 +12 @@
 
     public VirtualCollectionRegistryUsageException(String msg) {
-        this(msg, null);
+        this(msg, null, null);
     }
 
@@ -18 +18 @@
             Throwable cause) {
         this(msg, cause, null);
+    }
+
+    public VirtualCollectionRegistryUsageException(String msg,
+            List<String> validationErrors) {
+        this(msg, null, validationErrors);
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/Application.properties

@@ -25 +25 @@
   undone. Be aware that other users may not expect a published collection to \
   change!
+collections.publishwarningsconfirm: WARNING: The collection "${name}" does not \
+  meet all recommended criteria. The following warnings apply:\n {0}\n\
+  Would you still like to publish the collection?
+

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.html

@@ -10 +10 @@
   <div style="display: none" wicket:id="deleteCollectionDialog"></div>
   <div style="display: none" wicket:id="editPublishedCollectionDialog"></div>
+  <div style="display: none" wicket:id="confirmPublishCollectionDialog"></div>
   <div wicket:id="collectionsTable"></div>
 </wicket:panel>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.java

@@ -3 +3 @@
 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistry;
 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryException;
+import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryUsageException;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.VolatileEntityModel;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ConfirmationDialog;
@@ -10 +11 @@
 import eu.clarin.cmdi.virtualcollectionregistry.gui.table.VirtualCollectionTable;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionValidator;
 import java.security.Principal;
 import java.util.Collections;
+import java.util.List;
 import org.apache.wicket.Component;
 import org.apache.wicket.PageParameters;
+import org.apache.wicket.Session;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -21 +25 @@
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -30 +36 @@
 public class BrowseEditableCollectionsPanel extends Panel {
 
+    private final static Logger logger = LoggerFactory.getLogger(BrowseEditableCollectionsPanel.class);
+
     @SpringBean
     private VirtualCollectionRegistry vcr;
@@ -48 +56 @@
                                 protected void onClick(AjaxRequestTarget target,
                                         IModel<VirtualCollection> model) {
-                                    doPublish(target, model.getObject());
+                                    doPublish(target, model);
                                 }
                             };
@@ -109 +117 @@
                         @Override
                         public void onClick(AjaxRequestTarget target) {
-                            doPublish(target, getModelObject());
+                            doPublish(target, getModel());
                         }
                     };
@@ -159 +167 @@
     private final class PublishCollectionDialog extends ConfirmationDialog {
 
-        private long vcId;
+        private IModel<VirtualCollection> vcModel;
 
         public PublishCollectionDialog(String id,
@@ -170 +178 @@
         public void onConfirm(AjaxRequestTarget target) {
             try {
-                vcr.setVirtualCollectionState(getUser(), vcId,
-                        VirtualCollection.State.PUBLIC_PENDING);
-            } catch (VirtualCollectionRegistryException e) {
-                e.printStackTrace();
-            }
-        }
-
-        public void show(AjaxRequestTarget target, VirtualCollection vc) {
-            this.vcId = vc.getId();
+                try {
+                    prePublicationValidator.validate(vcModel.getObject());
+                    doPublish(vcModel.getObject().getId());
+                } catch (VirtualCollectionRegistryUsageException ex) {
+                    confirmPublishCollectionDialog.showDialogue(target, vcModel, ex.getValidationErrors());
+                }
+            } catch (VirtualCollectionRegistryException ex) {
+                logger.error("Could not publish collection {}, id {}", vcModel.getObject().getName(), vcModel.getObject().getId(), ex);
+                Session.get().error(ex.getMessage());
+            }
+        }
+
+        public void showDialogue(AjaxRequestTarget target, IModel<VirtualCollection> vc) {
+            this.vcModel = vc;
             super.show(target,
-                    new StringResourceModel("collections.publishconfirm",
-                            new VolatileEntityModel<VirtualCollection>(vc)));
+                    new StringResourceModel("collections.publishconfirm", vc));
         }
     } // class BrowsePrivateCollectionsPage.PublishCollectionDialog
+
+    private void doPublish(long vcId) throws VirtualCollectionRegistryException {
+        vcr.setVirtualCollectionState(getUser(), vcId,
+                VirtualCollection.State.PUBLIC_PENDING);
+    }
+
+    private final class ConfirmPublishCollectionDialog extends ConfirmationDialog {
+
+        private long vcId;
+
+        public ConfirmPublishCollectionDialog(String id,
+                final Component updateComponenet) {
+            super(id, updateComponenet);
+            setInitialWidth(400);
+        }
+
+        @Override
+        public void onConfirm(AjaxRequestTarget target) {
+            try {
+                doPublish(vcId);
+            } catch (VirtualCollectionRegistryException ex) {
+                logger.error("Could not publish collection with id {}", vcId, ex);
+                Session.get().error(ex.getMessage());
+            }
+        }
+
+        public void showDialogue(AjaxRequestTarget target, IModel<VirtualCollection> vc, List<String> warnings) {
+            this.vcId = vc.getObject().getId();
+            super.show(target,
+                    new StringResourceModel("collections.publishwarningsconfirm", vc, new Object[]{warnings}));
+        }
+
+    }
 
     private final class DeleteCollectionDialog extends ConfirmationDialog {
@@ -238 +283 @@
     private final DeleteCollectionDialog deleteDialog;
     private final EditPublishedCollectionDialog editPublishedDialog;
+    private final ConfirmPublishCollectionDialog confirmPublishCollectionDialog;
+
+    @SpringBean(name = "publication-soft")
+    private VirtualCollectionValidator prePublicationValidator;
 
     /**
@@ -264 +313 @@
         publishDialog = new PublishCollectionDialog("publishCollectionDialog", table);
         add(publishDialog);
-        
+
         deleteDialog = new DeleteCollectionDialog("deleteCollectionDialog", table);
         add(deleteDialog);
-        
+
         editPublishedDialog = new EditPublishedCollectionDialog("editPublishedCollectionDialog", table);
         add(editPublishedDialog);
-
+        
+        confirmPublishCollectionDialog = new ConfirmPublishCollectionDialog("confirmPublishCollectionDialog", table);
+        add(confirmPublishCollectionDialog);
     }
 
@@ -283 +334 @@
 
     private void doPublish(AjaxRequestTarget target,
-            VirtualCollection vc) {
-        publishDialog.show(target, vc);
+            IModel<VirtualCollection> vc) {
+        publishDialog.showDialogue(target, vc);
     }