Activity log list page #148 [skip ci]

src/main/java/com/databasepreservation/common/client/common/fields/MetadataField.java

@@ -68,7 +68,14 @@ public void setCSS(String styleName) {
     metadataField.addStyleName(styleName);
   }
 
-  public void setCSSMetadata(String cssParent, String cssLabel, String cssValue) {
+  public void setCSS(String cssParent, String cssValue) {
+    if (cssParent != null) {
+      metadataField.addStyleName(cssParent);
+    }
+    metadataValue.addStyleName(cssValue);
+  }
+
+  public void setCSS(String cssParent, String cssLabel, String cssValue) {
 
     if (cssParent != null) {
       metadataField.addStyleName(cssParent);
@@ -84,4 +91,8 @@ public Label getMetadataValue(){
   public void updateText(String text) {
     metadataValue.setText(text);
   }
+
+  public void updateText(SafeHtml html) {
+    metadataValue.setHTML(html);
+  }
 }

src/main/java/com/databasepreservation/common/client/common/lists/DatabaseList.java

@@ -144,7 +144,7 @@ public SafeHtml getValue(ViewerDatabase database) {
     Column<ViewerDatabase, SafeHtml> statusColumn = new TooltipColumn<ViewerDatabase>() {
       @Override
       public SafeHtml getValue(ViewerDatabase database) {
-        return database != null ? SafeHtmlUtils.fromString(Humanize.databaseStatus(database.getStatus())) : null;
+        return database != null ? LabelUtils.getDatabaseStatus(database.getStatus()) : null;
       }
     };
 

src/main/java/com/databasepreservation/common/client/common/lists/utils/AsyncTableCell.java

@@ -255,6 +255,10 @@ protected void fireChangeEvent(IndexResult<T> result) {
     }
     mainPanel.add(pageSizePager);
 
+    SimplePanel clearfix = new SimplePanel();
+    clearfix.addStyleName("clearfix");
+    add(clearfix);
+
     toggleSidePanel(createAndBindFacets(sidePanel));
 
     Alert alert = new Alert(Alert.MessageAlertType.LIGHT, messages.noItemsToDisplay());
@@ -603,7 +607,7 @@ public void nextPage() {
     resultsPager.nextPage();
   }
 
-  public void prevousPage() {
+  public void previousPage() {
     resultsPager.previousPage();
   }
 

src/main/java/com/databasepreservation/common/client/common/utils/LabelUtils.java

@@ -1,6 +1,7 @@
 package com.databasepreservation.common.client.common.utils;
 
 import com.databasepreservation.common.client.models.activity.logs.LogEntryState;
+import com.databasepreservation.common.client.models.structure.ViewerDatabaseStatus;
 import com.databasepreservation.common.client.models.structure.ViewerDatabaseValidationStatus;
 import com.databasepreservation.common.client.tools.Humanize;
 import com.google.gwt.safehtml.shared.SafeHtml;
@@ -56,4 +57,27 @@ public static SafeHtml getSIARDValidationStatus(ViewerDatabaseValidationStatus s
     return SafeHtmlUtils
         .fromSafeConstant("<span class='" + style + "'>" + Humanize.validationStatus(status) + CLOSE_SPAN);
   }
+
+  public static SafeHtml getDatabaseStatus(ViewerDatabaseStatus status) {
+    String style;
+    switch (status) {
+      case ERROR:
+        style = "label-danger label-error";
+        break;
+      case AVAILABLE:
+        style = "label-success";
+        break;
+      case INGESTING:
+        style = "label-info";
+        break;
+      case REMOVING:
+      case METADATA_ONLY:
+      default:
+        style = "label-default";
+        break;
+    }
+
+    return SafeHtmlUtils
+      .fromSafeConstant("<span class='" + style + "'>" + Humanize.databaseStatus(status) + CLOSE_SPAN);
+  }
 }

src/main/java/com/databasepreservation/common/client/common/visualization/activity/log/ActivityLogPanel.java

@@ -8,14 +8,17 @@
 import com.databasepreservation.common.client.ViewerConstants;
 import com.databasepreservation.common.client.common.ContentPanel;
 import com.databasepreservation.common.client.common.breadcrumb.BreadcrumbPanel;
+import com.databasepreservation.common.client.common.fields.MetadataField;
 import com.databasepreservation.common.client.common.lists.ActivityLogList;
 import com.databasepreservation.common.client.common.search.SearchField;
 import com.databasepreservation.common.client.common.search.SearchFieldPanel;
 import com.databasepreservation.common.client.common.search.SearchPanel;
 import com.databasepreservation.common.client.common.utils.AdvancedSearchUtils;
+import com.databasepreservation.common.client.common.utils.CommonClientUtils;
 import com.databasepreservation.common.client.common.utils.ListboxUtils;
 import com.databasepreservation.common.client.models.activity.logs.ActivityLogEntry;
 import com.databasepreservation.common.client.tools.BreadcrumbManager;
+import com.databasepreservation.common.client.tools.FontAwesomeIconManager;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -49,7 +52,10 @@ interface ActivityLogPanelUiBinder extends UiBinder<Widget, ActivityLogPanel> {
   SimplePanel advancedSearch;
 
   @UiField
-  SimplePanel facets;
+  SimplePanel mainHeader;
+
+  @UiField
+  SimplePanel description;
 
   @UiField(provided = true)
   ActivityLogList activityLogList;
@@ -70,6 +76,14 @@ private ActivityLogPanel() {
 
     initWidget(uiBinder.createAndBindUi(this));
 
+    mainHeader.setWidget(CommonClientUtils.getHeader(FontAwesomeIconManager.getTag(FontAwesomeIconManager.ACTIVITY_LOG),
+      messages.activityLogMenuText(), "h1"));
+
+    MetadataField instance = MetadataField.createInstance(messages.activityLogDescription());
+    instance.setCSS("table-row-description", "font-size-description");
+
+    description.setWidget(instance);
+
     activityLogList.getSelectionModel().addSelectionChangeHandler(event -> {
       ActivityLogEntry selected = activityLogList.getSelectionModel().getSelectedObject();
       if (selected != null) {

src/main/java/com/databasepreservation/common/client/common/visualization/activity/log/ActivityLogPanel.ui.xml

@@ -3,13 +3,14 @@
              xmlns:lists="urn:import:com.databasepreservation.common.client.common.lists"
 >
 
-    <g:FlowPanel addStyleNames="application-container">
-        <g:FlowPanel addStyleNames="manage-panel">
-            <g:SimplePanel ui:field="advancedSearch"/>
-            <g:FlowPanel addStyleNames="database-list">
-                <lists:ActivityLogList ui:field="activityLogList"/>
-            </g:FlowPanel>
-            <g:SimplePanel ui:field="facets"/>
+    <g:FlowPanel addStyleNames="activity-log-panel">
+        <g:FlowPanel addStyleNames="structure-header">
+            <g:SimplePanel addStyleNames="h1" ui:field="mainHeader"/>
+        </g:FlowPanel>
+        <g:SimplePanel ui:field="description"/>
+        <g:SimplePanel ui:field="advancedSearch"/>
+        <g:FlowPanel addStyleNames="database-list">
+            <lists:ActivityLogList ui:field="activityLogList"/>
         </g:FlowPanel>
     </g:FlowPanel>
 </ui:UiBinder>

src/main/java/com/databasepreservation/common/client/common/visualization/browse/ContainerPanel.ui.xml

@@ -4,7 +4,7 @@
 >
 
     <g:FlowPanel ui:field="toplevel" addStyleNames="content-container">
-        <g:FlowPanel addStyleNames="row full_width skip_padding">
+        <g:FlowPanel addStyleNames="full_width skip_padding">
             <g:FocusPanel addStyleNames="browseContentFocusPanel">
                 <g:HorizontalPanel addStyleNames="browseContentPreviewPanel">
                     <g:cell width="100%" height="100%">

src/main/java/com/databasepreservation/common/client/common/visualization/browse/information/DatabaseInformationPanel.java

@@ -154,15 +154,15 @@ private void initMetadataContent() {
   private MetadataField getMetadataField(String label, String value) {
     if (value != null) {
       MetadataField metadataField = MetadataField.createInstance(label, value);
-      metadataField.setCSSMetadata("metadata-field", "metadata-information-element-label",
+      metadataField.setCSS("metadata-field", "metadata-information-element-label",
         "metadata-information-element-value");
 
       return metadataField;
     }
 
     final MetadataField instance = MetadataField.createInstance(label,
       messages.managePageTableHeaderTextForDatabaseStatus());
-    instance.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    instance.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
 
     return instance;

src/main/java/com/databasepreservation/common/client/common/visualization/browse/technicalInformation/RoutinesPanel.java

@@ -116,19 +116,19 @@ private FlowPanel getRoutineDescription(ViewerRoutine viewerRoutine) {
 
     if (ViewerStringUtils.isNotBlank(viewerRoutine.getName())) {
       MetadataField schemaName = MetadataField.createInstance(messages.name(), viewerRoutine.getName());
-      schemaName.setCSSMetadata("metadata-field", "metadata-information-element-label",
+      schemaName.setCSS("metadata-field", "metadata-information-element-label",
               "metadata-information-element-value");
       panel.add(schemaName);
     }
     if (ViewerStringUtils.isNotBlank(viewerRoutine.getDescription())) {
       MetadataField description = MetadataField.createInstance(messages.description(), viewerRoutine.getDescription());
-      description.setCSSMetadata("metadata-field", "metadata-information-element-label",
+      description.setCSS("metadata-field", "metadata-information-element-label",
               "metadata-information-element-value");
       panel.add(description);
     }
     if (ViewerStringUtils.isNotBlank(viewerRoutine.getSource())) {
       MetadataField sourceCode = MetadataField.createInstance(messages.routine_sourceCode(), viewerRoutine.getSource());
-      sourceCode.setCSSMetadata("metadata-field", "metadata-information-element-label",
+      sourceCode.setCSS("metadata-field", "metadata-information-element-label",
               "metadata-information-element-value");
       panel.add(sourceCode);
     }
@@ -140,13 +140,13 @@ private FlowPanel getRoutineDescription(ViewerRoutine viewerRoutine) {
     }
     if (ViewerStringUtils.isNotBlank(viewerRoutine.getCharacteristic())) {
       MetadataField field = MetadataField.createInstance(messages.routine_characteristic(), viewerRoutine.getCharacteristic());
-      field.setCSSMetadata("metadata-field", "metadata-information-element-label",
+      field.setCSS("metadata-field", "metadata-information-element-label",
               "metadata-information-element-value");
       panel.add(field);
     }
     if (ViewerStringUtils.isNotBlank(viewerRoutine.getReturnType())) {
       MetadataField field = MetadataField.createInstance(messages.routine_returnType(), viewerRoutine.getReturnType());
-      field.setCSSMetadata("metadata-field", "metadata-information-element-label",
+      field.setCSS("metadata-field", "metadata-information-element-label",
               "metadata-information-element-value");
       panel.add(field);
     }

src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/BrowseNavigationPanel.java

@@ -9,13 +9,13 @@
 import com.databasepreservation.common.client.common.dialogs.CommonDialogs;
 import com.databasepreservation.common.client.common.dialogs.Dialogs;
 import com.databasepreservation.common.client.common.fields.MetadataField;
+import com.databasepreservation.common.client.common.utils.LabelUtils;
 import com.databasepreservation.common.client.common.visualization.manager.SIARDPanel.SIARDManagerPage;
 import com.databasepreservation.common.client.models.structure.ViewerDatabase;
 import com.databasepreservation.common.client.models.structure.ViewerDatabaseStatus;
 import com.databasepreservation.common.client.services.DatabaseService;
 import com.databasepreservation.common.client.services.SIARDService;
 import com.databasepreservation.common.client.tools.HistoryManager;
-import com.databasepreservation.common.client.tools.Humanize;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Button;
 
@@ -137,8 +137,8 @@ public NavigationPanel build() {
     }
 
     browsingStatus = MetadataField.createInstance(messages.SIARDHomePageLabelForBrowseStatus(),
-      Humanize.databaseStatus(database.getStatus()));
-    browsingStatus.setCSSMetadata(null, "label-field", "value-field");
+      LabelUtils.getDatabaseStatus(database.getStatus()));
+    browsingStatus.setCSS(null, "label-field", "value-field");
 
     browse.addToInfoPanel(browsingStatus);
 
@@ -147,7 +147,7 @@ public NavigationPanel build() {
 
   public void update(ViewerDatabase database) {
     this.database = database;
-    browsingStatus.updateText(Humanize.databaseStatus(database.getStatus()));
+    browsingStatus.updateText(LabelUtils.getDatabaseStatus(database.getStatus()));
 
     if (database.getStatus().equals(ViewerDatabaseStatus.AVAILABLE)
       || database.getStatus().equals(ViewerDatabaseStatus.ERROR)) {

src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/MetadataNavigationPanel.java

@@ -50,22 +50,22 @@ public FlowPanel build() {
 
     dbname = MetadataField.createInstance(messages.SIARDHomePageLabelForViewerMetadataName(),
       database.getMetadata().getName());
-    dbname.setCSSMetadata("metadata-field", "metadata-information-element-label", "metadata-information-element-value");
+    dbname.setCSS("metadata-field", "metadata-information-element-label", "metadata-information-element-value");
     archivalDate = MetadataField.createInstance(messages.SIARDHomePageLabelForViewerMetadataArchivalDate(),
         Humanize.formatDateTime(database.getMetadata().getArchivalDate()));
-    archivalDate.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    archivalDate.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
     archiver = MetadataField.createInstance(messages.SIARDHomePageLabelForViewerMetadataArchiver(),
       database.getMetadata().getArchiver());
-    archiver.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    archiver.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
     archiverContact = MetadataField.createInstance(messages.SIARDHomePageLabelForViewerMetadataArchiverContact(),
       database.getMetadata().getArchiverContact());
-    archiverContact.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    archiverContact.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
     clientMachine = MetadataField.createInstance(messages.SIARDHomePageLabelForViewerMetadataClientMachine(),
       database.getMetadata().getClientMachine());
-    clientMachine.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    clientMachine.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
 
     left.add(dbname);
@@ -76,20 +76,20 @@ public FlowPanel build() {
 
     databaseProduct = MetadataField.createInstance(messages.SIARDHomePageLabelForViewerMetadataDatabaseProduct(),
       database.getMetadata().getDatabaseProduct());
-    databaseProduct.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    databaseProduct.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
     dataOriginTimespan = MetadataField.createInstance(messages.SIARDHomePageLabelForViewerMetadataDataOriginTimespan(),
       database.getMetadata().getDataOriginTimespan());
-    dataOriginTimespan.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    dataOriginTimespan.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
     dataOwner = MetadataField.createInstance(messages.SIARDHomePageLabelForViewerMetadataDataOwner(),
       database.getMetadata().getDataOwner());
-    dataOwner.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    dataOwner.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
     producerApplication = MetadataField.createInstance(
       messages.SIARDHomePageLabelForViewerMetadataProducerApplication(),
       database.getMetadata().getProducerApplication());
-    producerApplication.setCSSMetadata("metadata-field", "metadata-information-element-label",
+    producerApplication.setCSS("metadata-field", "metadata-information-element-label",
       "metadata-information-element-value");
 
     right.add(databaseProduct);
@@ -115,7 +115,7 @@ public SimplePanel buildDescription() {
         descriptionTxt);
     }
 
-    descriptionPanel.setCSSMetadata("metadata-field", "metadata-information-description-label",
+    descriptionPanel.setCSS("metadata-field", "metadata-information-description-label",
       "metadata-information-element-value");
 
     panel.add(descriptionPanel);

src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/SIARDNavigationPanel.java

@@ -116,12 +116,12 @@ public void onSuccess(Boolean result) {
     // version information
     MetadataField version = MetadataField.createInstance(messages.SIARDHomePageLabelForSIARDVersion(),
         database.getVersion());
-    version.setCSSMetadata(null, "label-field", "value-field");
+    version.setCSS(null, "label-field", "value-field");
 
     // size information
     MetadataField size = MetadataField.createInstance(messages.SIARDHomePageLabelForSIARDSize(),
         Humanize.readableFileSize(database.getSize()));
-    size.setCSSMetadata(null, "label-field", "value-field");
+    size.setCSS(null, "label-field", "value-field");
 
     // path information
     GenericField path = GenericField.createInstance(messages.SIARDHomePageLabelForSIARDPath(), btnShowFiles);

src/main/java/com/databasepreservation/common/client/common/visualization/manager/SIARDPanel/navigation/ValidationNavigationPanel.java

@@ -157,11 +157,11 @@ public void onSuccess(Boolean result) {
     // Validation Status info
     validationStatus = MetadataField.createInstance(messages.SIARDHomePageLabelForValidationStatus(),
       LabelUtils.getSIARDValidationStatus(database.getValidationStatus()));
-    validationStatus.setCSSMetadata(null, "label-field", "value-field");
+    validationStatus.setCSS(null, "label-field", "value-field");
     // updateValidationStatus();
 
-    validatedAt.setCSSMetadata(null, "label-field", "value-field");
-    version.setCSSMetadata(null, "label-field", "value-field");
+    validatedAt.setCSS(null, "label-field", "value-field");
+    version.setCSS(null, "label-field", "value-field");
 
     NavigationPanel validation = NavigationPanel.createInstance(messages.SIARDHomePageOptionsHeaderForValidation());
     validation.addButton(btnRunValidator);

src/main/java/config/i18n/client/ClientMessages.java

@@ -1132,6 +1132,8 @@ public interface ClientMessages extends Messages {
    *******************************************/
   String activityLogMenuText();
 
+  String activityLogDescription();
+
   String activityLogTableHeaderForDate();
 
   String activityLogTableHeaderForComponent();