export csv button is now hidden when managing RI associations #1188; …

…cancel buttons on RI pages are now more coherent #1185
keeps · Mar 23, 2018 · 0fa5de5 · 0fa5de5
1 parent 8916d69
commit 0fa5de5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 26 deletions.
diff --git a/...roda-core/src/main/java/org/roda/core/common/notifications/FileNotificationProcessor.java b/...roda-core/src/main/java/org/roda/core/common/notifications/FileNotificationProcessor.java
@@ -43,6 +43,8 @@ public Notification processNotification(ModelService model, Notification notific
       Job job = (Job) scope.get(JOB_KEY);
       String content = createNotificationContent(job);
       notification.setBody(content);
+      notification.setState(NOTIFICATION_STATE.FAILED);
+
       if (dropPath != null && dropPath.startsWith("file:///")) {
         LOGGER.debug("Sending notification via drop folder ...");
         Path trimmedDropPath = Paths.get(dropPath.substring(7));
@@ -65,15 +67,12 @@ public Notification processNotification(ModelService model, Notification notific
             notification.setState(NOTIFICATION_STATE.COMPLETED);
           } catch (AlreadyExistsException | GenericException | IOException e) {
             LOGGER.warn("Notification not sent", e);
-            notification.setState(NOTIFICATION_STATE.FAILED);
           }
         } else {
           LOGGER.warn("Drop path is not a folder, cannot send notification.");
-          notification.setState(NOTIFICATION_STATE.FAILED);
         }
       } else {
         LOGGER.warn("No drop path, cannot send notification.");
-        notification.setState(NOTIFICATION_STATE.FAILED);
       }
     }
 

diff --git a/...ui/src/main/java/org/roda/wui/client/common/dialogs/RepresentationInformationDialogs.java b/...ui/src/main/java/org/roda/wui/client/common/dialogs/RepresentationInformationDialogs.java
@@ -238,6 +238,7 @@ public void onClick(ClickEvent event) {
                 }
 
                 if (table != null) {
+                  table.setCsvDownloadButtonVisibility(false);
                   table.addRedrawHandler(new AbstractHasData.RedrawEvent.Handler() {
                     @Override
                     public void onRedraw() {
@@ -508,6 +509,7 @@ public void onClick(ClickEvent event) {
                   Filter filter = new Filter(new NotSimpleFilterParameter(RodaConstants.INDEX_UUID, ri.getId()));
                   SelectRepresentationInformationDialog selectDialog = new SelectRepresentationInformationDialog(
                     messages.chooseEntityTitle(), filter, false);
+                  selectDialog.getList().setCsvDownloadButtonVisibility(false);
                   selectDialog.setSingleSelectionMode();
                   selectDialog.showAndCenter();
                   selectDialog.addValueChangeHandler(new ValueChangeHandler<RepresentationInformation>() {
@@ -738,6 +740,7 @@ public void onClick(ClickEvent event) {
 
         Filter filter = new Filter(new OneOfManyFilterParameter(RodaConstants.INDEX_UUID, aipsAlreadyLinked));
         SelectAipDialog selectAipDialog = new SelectAipDialog(messages.chooseEntityTitle(), filter, false, false);
+        selectAipDialog.getList().setCsvDownloadButtonVisibility(false);
         selectAipDialog.setSingleSelectionMode();
         selectAipDialog.showAndCenter();
         selectAipDialog.addValueChangeHandler(new ValueChangeHandler<IndexedAIP>() {
@@ -850,6 +853,7 @@ public static FlowPanel createInnerAddRepresentationInformationwithAssociation(f
     Filter defaultFilter = SearchFilters.defaultFilter(RepresentationInformation.class.getName());
     final RepresentationInformationList representationInformationList = new RepresentationInformationList(defaultFilter,
       facets, messages.representationInformationTitle(), true, 10, 10);
+    representationInformationList.setCsvDownloadButtonVisibility(false);
     representationInformationList.addRedrawHandler(new AbstractHasData.RedrawEvent.Handler() {
       @Override
       public void onRedraw() {

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/lists/utils/AsyncTableCell.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/lists/utils/AsyncTableCell.java
@@ -855,6 +855,10 @@ public boolean hasElementsSelected() {
     return true;
   }
 
+  public void setCsvDownloadButtonVisibility(boolean isVisible) {
+    csvDownloadButton.setVisible(isVisible);
+  }
+
   public Actionable<T> getActionable() {
     return actionable;
   }

diff --git a/...roda-wui/src/main/java/org/roda/wui/client/planning/RepresentationInformationNetwork.java b/...roda-wui/src/main/java/org/roda/wui/client/planning/RepresentationInformationNetwork.java
@@ -123,9 +123,6 @@ interface MyUiBinder extends UiBinder<Widget, RepresentationInformationNetwork>
   @UiField
   Button startProcess;
 
-  @UiField
-  Button buttonCancel;
-
   @UiField
   FlowPanel sidebar;
 
@@ -314,10 +311,4 @@ void handleButtonProcess(ClickEvent e) {
     selectedItems.setLastHistory(HistoryUtils.getCurrentHistoryPath());
     HistoryUtils.newHistory(CreateSelectedJob.RESOLVER, RodaConstants.JOB_PROCESS_ACTION);
   }
-
-  @UiHandler("buttonCancel")
-  void handleButtonCancel(ClickEvent e) {
-    LastSelectedItemsSingleton selectedItems = LastSelectedItemsSingleton.getInstance();
-    HistoryUtils.newHistory(selectedItems.getLastHistory());
-  }
 }
diff --git a/...da-wui/src/main/java/org/roda/wui/client/planning/RepresentationInformationNetwork.ui.xml b/...da-wui/src/main/java/org/roda/wui/client/planning/RepresentationInformationNetwork.ui.xml
@@ -46,10 +46,6 @@
 								<ui:text
 									from='{messages.representationInformationRegisterProcessButton}' />
 							</g:Button>
-							<g:Button addStyleNames="btn btn-block btn-default btn-times-circle"
-								ui:field="buttonCancel">
-								<ui:text from='{messages.cancelButton}' />
-							</g:Button>
 							<g:FlowPanel addStyleNames="sidebar-group sidebar-facet-panel facet-empty">
 								<g:Label addStyleNames="h4">
 									<ui:text from='{messages.representationInformationTags}' />

diff --git a/...ui/roda-wui/src/main/java/org/roda/wui/client/planning/ShowRepresentationInformation.java b/...ui/roda-wui/src/main/java/org/roda/wui/client/planning/ShowRepresentationInformation.java
@@ -228,7 +228,6 @@ public void onSuccess(String familyTranslation) {
         parPanel.setHTML("<span class='label label-info btn-separator-right ri-category'>"
           + messages.representationInformationListItems(category) + "</span>");
         parPanel.addClickHandler(new ClickHandler() {
-
           @Override
           public void onClick(ClickEvent event) {
             List<String> history = new ArrayList<>();
@@ -397,16 +396,16 @@ public void onSuccess(final RelationTypeTranslationsBundle bundle) {
 
           if (ri.getRelations() != null) {
             for (RepresentationInformationRelation relation : ri.getRelations()) {
-              GWT
-                .log(bundle.getTranslations().get(relation.getObjectType()).get(relation.getRelationType()).toString());
               String relationType = bundle.getTranslations().get(relation.getObjectType())
                 .get(relation.getRelationType());
-              if (relationTypeToLink.containsKey(relationType)) {
-                relationTypeToLink.get(relationType).add(relation);
-              } else {
-                List<RepresentationInformationRelation> newRelations = new ArrayList<>();
-                newRelations.add(relation);
-                relationTypeToLink.put(relationType, newRelations);
+              if (relationType != null) {
+                if (relationTypeToLink.containsKey(relationType)) {
+                  relationTypeToLink.get(relationType).add(relation);
+                } else {
+                  List<RepresentationInformationRelation> newRelations = new ArrayList<>();
+                  newRelations.add(relation);
+                  relationTypeToLink.put(relationType, newRelations);
+                }
               }
             }
           }

diff --git a/.../roda-wui/src/main/java/org/roda/wui/client/planning/ShowRepresentationInformation.ui.xml b/.../roda-wui/src/main/java/org/roda/wui/client/planning/ShowRepresentationInformation.ui.xml
@@ -100,7 +100,7 @@
 						</g:Button>
 						<g:Button addStyleNames="btn btn-block btn-default btn-times-circle"
 							ui:field="buttonCancel">
-							<ui:text from='{messages.cancelButton}' />
+							<ui:text from='{messages.backButton}' />
 						</g:Button>
 					</g:FlowPanel>
 				</g:FlowPanel>