Merge branch 'master'

Feature #13862

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --cc package.json
index 0093bbccad0597e8c02d7e72f04cb80e758b9884,f84170adc7330916fab7f1e074f2e3a357533443..30ea7b9f12c2b43a553c36053f86592f12a29d5f
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -29,6 -31,6 +31,7 @@@
      "react-transition-group": "2.5.0",
      "redux": "4.0.0",
      "redux-thunk": "2.3.0",
++    "reselect": "4.0.0",
      "shell-quote": "1.6.1",
      "unionize": "2.1.2",
      "uuid": "3.3.2"

diff --cc src/index.tsx
index c1238a545fa3e9d15f1e91ca5fcbf2387b1155b6,b3f351e025710729faefdeb4431a9218edbfffea..4998e26f3ec534fca9da09d7ad1513b8eee487c4
--- 1/src/index.tsx
--- 2/src/index.tsx
+++ b/src/index.tsx
@@@ -41,18 -41,11 +41,12 @@@ import { progressIndicatorActions } fro
  import { setUuidPrefix } from '~/store/workflow-panel/workflow-panel-actions';
  import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';
  import { ContainerRequestState } from '~/models/container-request';
 -import { MountKind } from './models/mount-types';
 +import { MountKind } from '~/models/mount-types';
- import { receiveTreePickerData, loadUserProject } from '~/store/tree-picker/tree-picker-actions';
- import { loadProject, loadCollection, initUserProject, initSharedProject, initFavoritesProject, initProjectsTreePicker } from './store/tree-picker/tree-picker-actions';
- import { ResourceKind } from '~/models/resource';
++import { initProjectsTreePicker } from './store/tree-picker/tree-picker-actions';
+ import { setBuildInfo } from '~/store/app-info/app-info-actions';
+ import { getBuildInfo } from '~/common/app-info';
  
- const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
- const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
- const getBuildInfo = () => getBuildNumber() + " / " + getGitCommit();
- 
- const buildInfo = getBuildInfo();
- 
- console.log(`Starting arvados [${buildInfo}]`);
+ console.log(`Starting arvados [${getBuildInfo()}]`);
  
  addMenuActionSet(ContextMenuKind.ROOT_PROJECT, rootProjectActionSet);
  addMenuActionSet(ContextMenuKind.PROJECT, projectActionSet);
@@@ -117,14 -111,6 +112,14 @@@ const initListener = (history: History
              await store.dispatch(loadWorkbench());
              addRouteChangeHandlers(history, store);
              // createEnumCollectorWorkflow(services);
-             
 +            store.dispatch(initProjectsTreePicker('testPicker1'));
 +            store.dispatch(initProjectsTreePicker('testPicker2'));
 +            store.dispatch(initProjectsTreePicker('testPicker3'));
++
 +            // await store.dispatch(loadCollection(
 +            //     'c97qk-4zz18-9sn8ygaf62chkkd',
 +            //     'testPicker',
 +            // ));
          }
      };
  };

diff --cc src/services/groups-service/groups-service.ts
Simple merge

diff --cc src/store/store.ts
index d38689c5029d3223642da4519ecfe033e736304a,60267807c700e0f7b43b69be2dc6498ee9988360..064faeca59a0cd289ef42c2d29d47b294d3b9db6
--- 1/src/store/store.ts
--- 2/src/store/store.ts
+++ b/src/store/store.ts
@@@ -38,6 -38,8 +38,7 @@@ import { progressIndicatorReducer } fro
  import { runProcessPanelReducer } from '~/store/run-process-panel/run-process-panel-reducer';
  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 =
@@@ -100,6 -102,8 +101,7 @@@ const createRootReducer = (services: Se
      fileUploader: fileUploaderReducer,
      processPanel: processPanelReducer,
      progressIndicator: progressIndicatorReducer,
 -    fileTreePicker: fileTreePickerReducer,
      runProcessPanel: runProcessPanelReducer,
+     appInfo: appInfoReducer,
      searchBar: searchBarReducer
  });

diff --cc yarn.lock
index e9f2b4bb4bf19b2238892544df07571489e7ed63,e6f3764cdd41ddda18bca3247ee8bc4dd8b319de..906596caa008ca6562a9976a81fca12812724560
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -7869,8 -6853,7 +6853,11 @@@ require-main-filename@^1.0.1
  requires-port@^1.0.0:
    version "1.0.0"
    resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+ 
++reselect@4.0.0:
++  version "4.0.0"
++  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
 +
  resolve-cwd@^2.0.0:
    version "2.0.0"
    resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"