Merge branch '17982-recent-saved-searches-display-bug' into main. Closes #17982

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

diff --git a/src/views-components/search-bar/search-bar-view.tsx b/src/views-components/search-bar/search-bar-view.tsx
index cab53403637c1b0770df4b0b070e70317bc32c56..284083477f00e2f4c13f1d13cee483367bbbf630 100644 (file)
--- a/src/views-components/search-bar/search-bar-view.tsx
+++ b/src/views-components/search-bar/search-bar-view.tsx
@@ -128,10 +128,10 @@ const handleKeyDown = (e: React.KeyboardEvent, props: SearchBarViewProps) => {
 const handleInputClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
     if (props.searchValue) {
         props.onSetView(SearchView.AUTOCOMPLETE);
-        props.openSearchView();
     } else {
-        props.closeView();
+        props.onSetView(SearchView.BASIC);
     }
+    props.openSearchView();
 };
 
 const handleDropdownClick = (e: React.MouseEvent, props: SearchBarViewProps) => {

diff --git a/src/views/ssh-key-panel/ssh-key-panel.tsx b/src/views/ssh-key-panel/ssh-key-panel.tsx
index 672b1bf316339eb3a49053f12657d5519639f575..24ca3468d181bc37dafe9d51f2cbdc4098fc7ae5 100644 (file)
--- a/src/views/ssh-key-panel/ssh-key-panel.tsx
+++ b/src/views/ssh-key-panel/ssh-key-panel.tsx
@@ -11,7 +11,7 @@ import { SshKeyPanelRoot, SshKeyPanelRootDataProps, SshKeyPanelRootActionProps }
 
 const mapStateToProps = (state: RootState): SshKeyPanelRootDataProps => {
     const sshKeys = state.auth.sshKeys.filter((key) => {
-      return key.authorizedUserUuid == (state.auth.user ? state.auth.user.uuid : null);
+      return key.authorizedUserUuid === (state.auth.user ? state.auth.user.uuid : null);
     });
 
     return {

diff --git a/tools/arvados_config.yml b/tools/arvados_config.yml
index 963da48d8dca385f0fba311de4a0ac09ee860224..3fcd61194b3c2635287ebc0fe07bb0754dddc773 100644 (file)
--- a/tools/arvados_config.yml
+++ b/tools/arvados_config.yml
@@ -17,6 +17,11 @@ Clusters:
     Login:
       PAM:
         Enable: true
+    StorageClasses:
+      default:
+        Default: true
+      foo: {}
+      bar: {}
     Volumes:
       zzzzz-nyw5e-000000000000000:
         StorageClasses: