Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14307-search-basic...

refs #2
14307

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --cc src/store/store.ts
index ad1c8477693f3c2a052d1686f8caa8b4045fe1ed,8e753660b26e19c91f15e17de52239ed506ef6e1..60267807c700e0f7b43b69be2dc6498ee9988360
--- 1/src/store/store.ts
--- 2/src/store/store.ts
+++ b/src/store/store.ts
@@@ -39,7 -39,7 +39,8 @@@ import { runProcessPanelReducer } from 
  import { WorkflowMiddlewareService } from './workflow-panel/workflow-middleware-service';
  import { WORKFLOW_PANEL_ID } from './workflow-panel/workflow-panel-actions';
  import { fileTreePickerReducer } from './file-tree-picker/file-tree-picker-reducer';
 +import { appInfoReducer } from '~/store/app-info/app-info-reducer';
+ import { searchBarReducer } from './search-bar/search-bar-reducer';
  
  const composeEnhancers =
      (process.env.NODE_ENV === 'development' &&
@@@ -103,5 -103,5 +104,6 @@@ const createRootReducer = (services: Se
      progressIndicator: progressIndicatorReducer,
      fileTreePicker: fileTreePickerReducer,
      runProcessPanel: runProcessPanelReducer,
-     appInfo: appInfoReducer
++    appInfo: appInfoReducer,
+     searchBar: searchBarReducer
  });

diff --cc src/views-components/main-app-bar/main-app-bar.tsx
Simple merge