Skip to content

Commit

Permalink
Use message constants and reorganize code
Browse files Browse the repository at this point in the history
  • Loading branch information
SugaryLump committed Nov 27, 2024
1 parent b6b1413 commit b2c0e01
Show file tree
Hide file tree
Showing 11 changed files with 637 additions and 460 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.databasepreservation.common.client.common.lists.DatabaseSelectList;
import com.databasepreservation.common.client.common.lists.utils.AsyncTableCellOptions;
import com.databasepreservation.common.client.common.lists.utils.ListBuilder;
import com.databasepreservation.common.client.common.search.SearchPanel;
import com.databasepreservation.common.client.common.search.SearchPanelWithSearchAll;
import com.databasepreservation.common.client.common.search.SearchWrapper;
import com.databasepreservation.common.client.index.FindRequest;
import com.databasepreservation.common.client.index.IndexResult;
Expand Down Expand Up @@ -44,7 +44,7 @@
public class DatabaseSelectDialog extends DialogBox {
private ClientMessages messages;
private SearchWrapper databasesSearchWrapper;
private SearchPanel parentSearchPanel;
private SearchPanelWithSearchAll parentSearchPanel;
private Filter defaultFilter;
private String listId;

Expand All @@ -62,12 +62,13 @@ public DatabaseSelectDialog() {
}

public <T extends IsIndexed> DatabaseSelectDialog(Filter defaultFilter, String allFilter, ClientMessages messages,
SearchPanel parentSearchPanel) {
SearchPanelWithSearchAll parentSearchPanel) {
super(true, true);
init(defaultFilter, allFilter, messages, parentSearchPanel);
}

public void init(Filter defaultFilter, String allFilter, ClientMessages messages, SearchPanel parentSearchPanel) {
public void init(Filter defaultFilter, String allFilter, ClientMessages messages,
SearchPanelWithSearchAll parentSearchPanel) {
setAutoHideEnabled(true);
setModal(true);
setText("Select databases to search");
Expand Down Expand Up @@ -153,8 +154,9 @@ public void resetExcludedInfo() {
}

public void updateExcludedInfo() {
this.exludedInfo.setWidget(new HTML(
SafeHtmlUtils.fromSafeConstant(messages.manageDatabaseSearchAllExcluded(this.notLoaded, this.notSearchable))));
this.exludedInfo
.setWidget(new HTML(SafeHtmlUtils.fromSafeConstant(messages.manageDatabaseSearchAllExcludedLoaded(this.notLoaded)
+ messages.manageDatabaseSearchAllExcludedPrivacy(this.notSearchable))));
}

public void writeSelectedObjectsToLocalStorage() {
Expand Down Expand Up @@ -195,13 +197,13 @@ private void doParentSearch(List<String> selectedUUIDs) {
if (selectedUUIDs != null) {
Filter newFilter = new Filter(this.defaultFilter);
newFilter.add(new OneOfManyFilterParameter(ViewerConstants.SOLR_ROWS_DATABASE_UUID, selectedUUIDs));
this.parentSearchPanel.setSearchAllTotalDatabases(String.valueOf(selectedUUIDs.size()));
this.parentSearchPanel.setSearchAllTotalDatabases((long) selectedUUIDs.size());
this.parentSearchPanel.setDefaultFilter(newFilter);
this.parentSearchPanel.doSearch();
} else {
if (ClientConfigurationManager.getStringWithDefault(ViewerConstants.SEARCHALL_SELECTEDALL,
ViewerConstants.PROPERTY_SEARCHALL_DEFAULTSELECTION).equals(ViewerConstants.SEARCHALL_SELECTEDALL)) {
this.parentSearchPanel.setSearchAllTotalDatabases("all");
this.parentSearchPanel.setSearchAllTotalDatabases(this.list.getResult().getTotalCount());
this.parentSearchPanel.setDefaultFilter(defaultFilter);
this.parentSearchPanel.doSearch();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
/**
* @author Alexandre Flores <aflores@keep.pt>
*/
public class SearchAllButtonWrapper extends SimplePanel implements HasValueChangeHandlers<String> {
public String totalSelectedDatabases;
public class SearchAllButtonWrapper extends SimplePanel implements HasValueChangeHandlers<Long> {
public Long totalSelectedDatabases;

private Button button;
private DatabaseSelectDialog databaseSelectDialog;

public void init(Filter defaultFilter, String allFilter, ClientMessages messages, SearchPanel parentSearchPanel) {
this.button = new Button("Searching on " + this.totalSelectedDatabases + " databases");
public void init(Filter defaultFilter, String allFilter, ClientMessages messages,
SearchPanelWithSearchAll parentSearchPanel) {
this.button = new Button();
this.button.addStyleName("btn-link-info btn");
this.databaseSelectDialog = new DatabaseSelectDialog(defaultFilter, allFilter, messages, parentSearchPanel);
this.button.addClickHandler(event -> {
Expand All @@ -32,16 +33,16 @@ public void init(Filter defaultFilter, String allFilter, ClientMessages messages
setWidget(this.button);
}

public String getTotalSelectedDatabases() {
public Long getTotalSelectedDatabases() {
return this.totalSelectedDatabases;
}

@Override
public HandlerRegistration addValueChangeHandler(ValueChangeHandler<String> handler) {
public HandlerRegistration addValueChangeHandler(ValueChangeHandler<Long> handler) {
return addHandler(handler, ValueChangeEvent.getType());
}

public void setTotalSelectedDatabases(String totalSelectedDatabases) {
public void setTotalSelectedDatabases(Long totalSelectedDatabases) {
this.totalSelectedDatabases = totalSelectedDatabases;
this.button.setHTML(SafeHtmlUtils.fromSafeConstant("Searching on " + this.totalSelectedDatabases + " databases"));
ValueChangeEvent.fire(this, totalSelectedDatabases);
Expand Down
Loading

0 comments on commit b2c0e01

Please sign in to comment.