search all databases redirects to search

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

@@ -169,9 +169,9 @@ public String getValue(ViewerDatabase database) {
  @Override
  public void onSuccess(User user) {
  if (user.isAdmin()) {
- HistoryManager.gotoSIARDInfo(object.getUuid());
+ HistoryManager.gotoHome();
  } else {
- HistoryManager.gotoDatabase(object.getUuid());
+ HistoryManager.gotoHome();
  }
  }
  });

src/main/java/com/databasepreservation/common/client/common/search/SearchWrapper.java

@@ -129,12 +129,16 @@ private <T extends IsIndexed> void attachComponents(String objectClassSimpleName
  }
  }
 
+ public Components getComponents() {
+ return components;
+ }
+
  /**
  * Auxiliary manager for inner components (groups of one searchWrapper and one
  * BasicAsyncTableCell, at least for now) that is used to enforce type coherence
  */
  @SuppressWarnings("unchecked")
- private class Components {
+ public class Components {
  private final Map<String, SearchPanel> searchPanels = new LinkedHashMap<>();
  private final Map<String, AsyncTableCell<? extends IsIndexed, Void>> lists = new LinkedHashMap<>();
 

src/main/java/com/databasepreservation/common/client/common/visualization/browse/DatabaseSearchPanel.java

@@ -56,8 +56,8 @@ public class DatabaseSearchPanel extends RightPanel implements ICollectionStatus
  private static Map<String, DatabaseSearchPanel> instances = new HashMap<>();
  private final CollectionStatus status;
 
- public static DatabaseSearchPanel getInstance(ViewerDatabase database, CollectionStatus status) {
- return instances.computeIfAbsent(database.getUuid(), k -> new DatabaseSearchPanel(database, status));
+ public static DatabaseSearchPanel getInstance(ViewerDatabase database, CollectionStatus status, String search) {
+ return instances.computeIfAbsent(database.getUuid(), k -> new DatabaseSearchPanel(database, status, search));
  }
 
  interface DatabaseSearchPanelUiBinder extends UiBinder<Widget, DatabaseSearchPanel> {
@@ -96,7 +96,7 @@ interface DatabaseSearchPanelUiBinder extends UiBinder<Widget, DatabaseSearchPan
 
  private ViewerDatabase database;
 
- private DatabaseSearchPanel(ViewerDatabase database, CollectionStatus status) {
+ private DatabaseSearchPanel(ViewerDatabase database, CollectionStatus status, String search) {
  tableSearchPanelContainers = new ArrayList<>();
  noResults = new Alert(Alert.MessageAlertType.INFO, messages.noRecordsMatchTheSearchTerms());
  this.status = status;
@@ -148,13 +148,17 @@ public void onSuccess(TableSearchPanelContainer eventTriggered) {
  this.database = database;
 
  searchInputBox.getElement().setPropertyString("placeholder", messages.searchPlaceholder());
-
+ if (!search.isEmpty()) {
+ searchInputBox.setText(search);
+ doSearch();
+ }
  searchInputBox.addKeyDownHandler(event -> {
  if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
  doSearch();
  }
  });
 
+
  searchInputButton.addClickHandler(event -> doSearch());
  }
 

src/main/java/com/databasepreservation/common/client/common/visualization/manager/databasePanel/admin/DatabaseManage.java

@@ -97,7 +97,7 @@ private DatabaseManage() {
  allDatabaseList.getSelectionModel().addSelectionChangeHandler(event -> {
  ViewerDatabase selected = allDatabaseList.getSelectionModel().getSelectedObject();
  if (selected != null) {
- HistoryManager.gotoSIARDInfo(selected.getUuid());
+ HistoryManager.gotoDatabaseSearchWithValue(selected.getUuid(), search.getComponents().getSearchPanel("DatabaseList_all").getCurrentFilter());
  allDatabaseList.getSelectionModel().clear();
  }
  });

src/main/java/com/databasepreservation/common/client/common/visualization/manager/databasePanel/user/UserDatabaseListPanel.java

@@ -96,7 +96,7 @@ private UserDatabaseListPanel() {
  ViewerDatabase selected = allDatabaseList.getSelectionModel().getSelectedObject();
  if (selected != null) {
  if (ApplicationType.getType().equals(ViewerConstants.APPLICATION_ENV_SERVER)) {
- HistoryManager.gotoDatabase(selected.getUuid());
+ HistoryManager.gotoDatabaseSearchWithValue(selected.getUuid(), search.getComponents().getSearchPanel("DatabaseList_all").getCurrentFilter());
  }
  allDatabaseList.getSelectionModel().clear();
  }

src/main/java/com/databasepreservation/common/client/tools/HistoryManager.java

@@ -128,6 +128,10 @@ public static void gotoDatabaseSearch(String databaseUUID) {
  newHistory(Arrays.asList(ROUTE_DATABASE, databaseUUID, ROUTE_DATABASE_SEARCH));
  }
 
+ public static void gotoDatabaseSearchWithValue(String databaseUUID, String search) {
+ newHistory(Arrays.asList(ROUTE_DATABASE, databaseUUID, ROUTE_DATABASE_SEARCH, search));
+ }
+
  public static void gotoDatabaseReport(String databaseUUID) {
  newHistory(Arrays.asList(ROUTE_DATABASE, databaseUUID, ROUTE_DATABASE_REPORT));
  }

src/main/java/com/databasepreservation/desktop/client/main/MainPanelDesktop.java

@@ -154,9 +154,22 @@ public RightPanel load(ViewerDatabase database, CollectionStatus status) {
  setContent(databaseUUID, currentHistoryPath.get(0), currentHistoryPath.get(2), new RightPanelLoader() {
  @Override
  public RightPanel load(ViewerDatabase database, CollectionStatus status) {
- return DatabaseSearchPanel.getInstance(database, status);
+ return DatabaseSearchPanel.getInstance(database, status, "");
  }
  });
+ } else if (currentHistoryPath.size() == 4
+ && currentHistoryPath.get(2).equals(HistoryManager.ROUTE_DATABASE_SEARCH)) {
+ // #database/<id>/search/<search_value>
+ String databaseUUID = currentHistoryPath.get(1);
+ String searchValue = currentHistoryPath.get(3);
+ setContent(databaseUUID, HistoryManager.ROUTE_DATABASE, currentHistoryPath.get(2),
+ new RightPanelLoader() {
+ @Override
+ public RightPanel load(ViewerDatabase database, CollectionStatus status) {
+ return DatabaseSearchPanel.getInstance(database, status, searchValue);
+ }
+ });
+
  } else if (currentHistoryPath.size() == 3
  && currentHistoryPath.get(2).equals(HistoryManager.ROUTE_SCHEMA_ROUTINES)) {
  // #database/<database_uuid>/routines

src/main/java/com/databasepreservation/server/client/main/MainPanel.java

@@ -408,13 +408,25 @@ public RightPanel load(ViewerDatabase database, CollectionStatus status) {
 
  } else if (currentHistoryPath.size() == 3
  && currentHistoryPath.get(2).equals(HistoryManager.ROUTE_DATABASE_SEARCH)) {
- // #database/<id>/search
+ // #database/<id>/search/
  String databaseUUID = currentHistoryPath.get(1);
  setContent(databaseUUID, HistoryManager.ROUTE_DATABASE, currentHistoryPath.get(2),
  new RightPanelLoader() {
  @Override
  public RightPanel load(ViewerDatabase database, CollectionStatus status) {
- return DatabaseSearchPanel.getInstance(database, status);
+ return DatabaseSearchPanel.getInstance(database, status, "");
+ }
+ });
+ } else if (currentHistoryPath.size() == 4
+ && currentHistoryPath.get(2).equals(HistoryManager.ROUTE_DATABASE_SEARCH)) {
+ // #database/<id>/search/<search_value>
+ String databaseUUID = currentHistoryPath.get(1);
+ String searchValue = currentHistoryPath.get(3);
+ setContent(databaseUUID, HistoryManager.ROUTE_DATABASE, currentHistoryPath.get(2),
+ new RightPanelLoader() {
+ @Override
+ public RightPanel load(ViewerDatabase database, CollectionStatus status) {
+ return DatabaseSearchPanel.getInstance(database, status, searchValue);
  }
  });