Initial searchall load

keeps · Nov 28, 2024 · 4283ac2 · 4283ac2
1 parent 315e7c7
commit 4283ac2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/...main/java/com/databasepreservation/common/client/common/dialogs/DatabaseSelectDialog.java b/...main/java/com/databasepreservation/common/client/common/dialogs/DatabaseSelectDialog.java
@@ -133,6 +133,8 @@ public void init(Filter defaultFilter, String allFilter, ClientMessages messages
     setWidth("1400px");
     addStyleName("wui-dialog-confirm");
     setGlassEnabled(true);
+
+    doParentSearch();
   }
 
   public void resetExcludedInfo() {
@@ -216,20 +218,19 @@ private void doParentSearch() {
     if (selectedUUIDs != null) {
       Filter newFilter = new Filter(this.defaultFilter);
       newFilter.add(new OneOfManyFilterParameter(ViewerConstants.SOLR_ROWS_DATABASE_UUID, selectedUUIDs));
-      this.parentSearchPanel.setSearchAllTotalDatabases((long) selectedUUIDs.size());
+      this.parentSearchPanel.setSearchAllTotalDatabases(String.valueOf(selectedUUIDs.size()));
       this.parentSearchPanel.setDefaultFilter(newFilter);
       this.parentSearchPanel.doSearch();
     } else if (selectedAll || ClientConfigurationManager
       .getStringWithDefault(ViewerConstants.SEARCHALL_SELECTEDALL, ViewerConstants.PROPERTY_SEARCHALL_DEFAULTSELECTION)
       .equals(ViewerConstants.SEARCHALL_SELECTEDALL)) {
-      this.parentSearchPanel.setSearchAllTotalDatabases(this.list.getResult().getTotalCount());
+      this.parentSearchPanel.setSearchAllTotalDatabases("all");
       this.parentSearchPanel.setDefaultFilter(defaultFilter);
       this.parentSearchPanel.doSearch();
     } else {
-      this.parentSearchPanel.setSearchAllTotalDatabases(0L);
+      this.parentSearchPanel.setSearchAllTotalDatabases("0");
       this.parentSearchPanel.setDefaultFilter(defaultFilter);
       this.parentSearchPanel.doSearch();
-
     }
   }
 }
diff --git a/...ain/java/com/databasepreservation/common/client/common/search/SearchAllButtonWrapper.java b/...ain/java/com/databasepreservation/common/client/common/search/SearchAllButtonWrapper.java
@@ -16,9 +16,9 @@
 /**
  * @author Alexandre Flores <aflores@keep.pt>
  */
-public class SearchAllButtonWrapper extends SimplePanel implements HasValueChangeHandlers<Long> {
+public class SearchAllButtonWrapper extends SimplePanel implements HasValueChangeHandlers<String> {
   private ClientMessages messages;
-  public Long totalSelectedDatabases;
+  public String totalSelectedDatabases;
 
   private Button button;
   private DatabaseSelectDialog databaseSelectDialog;
@@ -28,7 +28,7 @@ public void init(Filter defaultFilter, String allFilter, ClientMessages messages
     this.messages = messages;
     this.button = new Button();
     this.button.addStyleName("btn-link-info btn btn-searchall-dialog");
-    setTotalSelectedDatabases(0L);
+    setTotalSelectedDatabases("0");
     this.databaseSelectDialog = new DatabaseSelectDialog(defaultFilter, allFilter, messages, parentSearchPanel);
     this.button.addClickHandler(event -> {
       this.databaseSelectDialog.center();
@@ -37,16 +37,16 @@ public void init(Filter defaultFilter, String allFilter, ClientMessages messages
     setWidget(this.button);
   }
 
-  public Long getTotalSelectedDatabases() {
+  public String getTotalSelectedDatabases() {
     return this.totalSelectedDatabases;
   }
 
   @Override
-  public HandlerRegistration addValueChangeHandler(ValueChangeHandler<Long> handler) {
+  public HandlerRegistration addValueChangeHandler(ValueChangeHandler<String> handler) {
     return addHandler(handler, ValueChangeEvent.getType());
   }
 
-  public void setTotalSelectedDatabases(Long totalSelectedDatabases) {
+  public void setTotalSelectedDatabases(String totalSelectedDatabases) {
     this.totalSelectedDatabases = totalSelectedDatabases;
     this.button
       .setHTML(SafeHtmlUtils.fromSafeConstant(messages.manageDatabaseSearchAllSearchingOn(this.totalSelectedDatabases)

diff --git a/...n/java/com/databasepreservation/common/client/common/search/SearchPanelWithSearchAll.java b/...n/java/com/databasepreservation/common/client/common/search/SearchPanelWithSearchAll.java
@@ -76,15 +76,15 @@ public void bindUIAndInitWidget() {
     initWidget(binder.createAndBindUi(this));
   }
 
-  public void setSearchAllTotalDatabases(Long searchAllTotalDatabases) {
+  public void setSearchAllTotalDatabases(String searchAllTotalDatabases) {
     this.selectedDatabasesButtonWrapper.setTotalSelectedDatabases(searchAllTotalDatabases);
   }
 
   public SearchAllButtonWrapper getSearchAllButtonWrapper() {
     return this.selectedDatabasesButtonWrapper;
   }
 
-  public Long getTotalSelected() {
+  public String getTotalSelected() {
     return this.selectedDatabasesButtonWrapper.getTotalSelectedDatabases();
   }
 }
diff --git a/src/main/java/com/databasepreservation/common/client/common/search/SearchWrapper.java b/src/main/java/com/databasepreservation/common/client/common/search/SearchWrapper.java
@@ -147,7 +147,7 @@ private <T extends IsIndexed> void attachComponents(String objectClassSimpleName
     rootPanel.add(searchPanel);
 
     if (!(searchPanel instanceof SearchPanelWithSearchAll)
-      || ((SearchPanelWithSearchAll) searchPanel).getTotalSelected() != 0) {
+      || !((SearchPanelWithSearchAll) searchPanel).getTotalSelected().equals("0")) {
       if (scrollPanelCssClasses != null) {
         ScrollPanel scrollPanel = new ScrollPanel(list);
         scrollPanel.addStyleName(scrollPanelCssClasses);
@@ -187,8 +187,8 @@ public Components getComponents() {
     return components;
   }
 
-  public void onSearchAllSelectionChanged(Long totalSelected) {
-    if (totalSelected == 0) {
+  public void onSearchAllSelectionChanged(String totalSelected) {
+    if (totalSelected.equals("0")) {
       reattachComponentsWithErrorMessage(
         new HTML(SafeHtmlUtils.fromSafeConstant(messages.manageDatabaseSearchAllNoneSelected())));
     } else {

diff --git a/src/main/java/config/i18n/client/ClientMessages.java b/src/main/java/config/i18n/client/ClientMessages.java
@@ -712,7 +712,7 @@ public interface ClientMessages extends Messages {
 
   String manageDatabasePageDescription();
 
-  String manageDatabaseSearchAllSearchingOn(long total);
+  String manageDatabaseSearchAllSearchingOn(String total);
 
   String manageDatabaseSearchAllNoneSelected();
 

diff --git a/src/main/resources/config/dbvtk-viewer.properties b/src/main/resources/config/dbvtk-viewer.properties
@@ -15,6 +15,7 @@ ui.sharedProperties.whitelist.configuration.prefix=ui.viewer
 ui.sharedProperties.whitelist.configuration.prefix=ui.disable
 ui.sharedProperties.whitelist.configuration.prefix=ui.plugin
 ui.sharedProperties.whitelist.configuration.prefix=ui.reference
+ui.sharedProperties.whitelist.configuration.prefix=ui.searchAll
 ui.sharedProperties.whitelist.configuration.property=lists
 ui.sharedProperties.whitelist.configuration.property=ui.lists
 ui.sharedProperties.whitelist.messages.prefix=ui.facets