16719: Merge branch 'master' into 16719-collection-version-basic-ui

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --combined src/components/icon/icon.tsx
index 18adb5abbf375f586bb3158207cb72d11548c30a,2573d764d5f79207141db7887caf0edcb1f8561e..55c3c5a50f44759f10bbee681299b5ebe92cc32a
--- 1/src/components/icon/icon.tsx
--- 2/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@@ -3,7 -3,6 +3,7 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import * as React from 'react';
 +import { Badge, Tooltip } from '@material-ui/core';
  import Add from '@material-ui/icons/Add';
  import ArrowBack from '@material-ui/icons/ArrowBack';
  import ArrowDropDown from '@material-ui/icons/ArrowDropDown';
@@@ -28,7 -27,6 +28,7 @@@ import Folder from '@material-ui/icons/
  import GetApp from '@material-ui/icons/GetApp';
  import Help from '@material-ui/icons/Help';
  import HelpOutline from '@material-ui/icons/HelpOutline';
 +import History from '@material-ui/icons/History';
  import Inbox from '@material-ui/icons/Inbox';
  import Info from '@material-ui/icons/Info';
  import Input from '@material-ui/icons/Input';
@@@ -56,6 -54,7 +56,7 @@@ import Star from '@material-ui/icons/St
  import StarBorder from '@material-ui/icons/StarBorder';
  import Warning from '@material-ui/icons/Warning';
  import VpnKey from '@material-ui/icons/VpnKey';
+ import LinkOutlined from '@material-ui/icons/LinkOutlined';
  
  // Import FontAwesome icons
  import { library } from '@fortawesome/fontawesome-svg-core';
@@@ -74,13 -73,6 +75,13 @@@ export const ReadOnlyIcon = (props:any
          </div>
      </span>;
  
 +export const CollectionOldVersionIcon = (props: any) =>
 +    <Tooltip title='Old version'>
 +        <Badge badgeContent={<History fontSize='small' />}>
 +            <CollectionIcon {...props} />
 +        </Badge>
 +    </Tooltip>;
 +
  export type IconType = React.SFC<{ className?: string, style?: object }>;
  
  export const AddIcon: IconType = (props) => <Add {...props} />;
@@@ -97,13 -89,11 +98,13 @@@ export const CloseIcon: IconType = (pro
  export const CloudUploadIcon: IconType = (props) => <CloudUpload {...props} />;
  export const DefaultIcon: IconType = (props) => <RateReview {...props} />;
  export const DetailsIcon: IconType = (props) => <Info {...props} />;
 +export const DirectoryIcon: IconType = (props) => <Folder {...props} />;
  export const DownloadIcon: IconType = (props) => <GetApp {...props} />;
  export const EditSavedQueryIcon: IconType = (props) => <Create {...props} />;
  export const ExpandIcon: IconType = (props) => <ExpandMoreIcon {...props} />;
  export const ErrorIcon: IconType = (props) => <ErrorRoundedIcon style={{color: '#ff0000'}} {...props} />;
  export const FavoriteIcon: IconType = (props) => <Star {...props} />;
 +export const FileIcon: IconType = (props) => <LibraryBooks {...props} />;
  export const HelpIcon: IconType = (props) => <Help {...props} />;
  export const HelpOutlineIcon: IconType = (props) => <HelpOutline {...props} />;
  export const ImportContactsIcon: IconType = (props) => <ImportContacts {...props} />;
@@@ -139,3 -129,4 +140,4 @@@ export const UserPanelIcon: IconType = 
  export const UsedByIcon: IconType = (props) => <Folder {...props} />;
  export const WorkflowIcon: IconType = (props) => <Code {...props} />;
  export const WarningIcon: IconType = (props) => <Warning style={{ color: '#fbc02d', height: '30px', width: '30px' }} {...props} />;
+ export const Link: IconType = (props) => <LinkOutlined {...props} />;

diff --combined src/index.tsx
index a4353d4e0636c08916cee01dfe2149eebe16eb52,92a2716b6a7fbe6c24010e68994cfc7295680f51..569656d9117874646b238616330e25d640aa932e
--- 1/src/index.tsx
--- 2/src/index.tsx
+++ b/src/index.tsx
@@@ -28,6 -28,7 +28,6 @@@ import { collectionFilesActionSet, read
  import { collectionFilesItemActionSet, readOnlyCollectionFilesItemActionSet } from '~/views-components/context-menu/action-sets/collection-files-item-action-set';
  import { collectionFilesNotSelectedActionSet } from '~/views-components/context-menu/action-sets/collection-files-not-selected-action-set';
  import { collectionActionSet, readOnlyCollectionActionSet } from '~/views-components/context-menu/action-sets/collection-action-set';
 -import { collectionResourceActionSet } from '~/views-components/context-menu/action-sets/collection-resource-action-set';
  import { processActionSet } from '~/views-components/context-menu/action-sets/process-action-set';
  import { loadWorkbench } from '~/store/workbench/workbench-actions';
  import { Routes } from '~/routes/routes';
@@@ -62,6 -63,7 +62,7 @@@ import { processResourceAdminActionSet 
  import { projectAdminActionSet } from '~/views-components/context-menu/action-sets/project-admin-action-set';
  import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions";
  import { openNotFoundDialog } from './store/not-found-panel/not-found-panel-action';
+ import { storeRedirects } from './common/redirect-to';
  
  console.log(`Starting arvados [${getBuildInfo()}]`);
  
@@@ -76,6 -78,7 +77,6 @@@ addMenuActionSet(ContextMenuKind.COLLEC
  addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet);
  addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILES_ITEM, readOnlyCollectionFilesItemActionSet);
  addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet);
 -addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet);
  addMenuActionSet(ContextMenuKind.READONLY_COLLECTION, readOnlyCollectionActionSet);
  addMenuActionSet(ContextMenuKind.TRASHED_COLLECTION, trashedCollectionActionSet);
  addMenuActionSet(ContextMenuKind.PROCESS, processActionSet);
@@@ -95,6 -98,8 +96,8 @@@ addMenuActionSet(ContextMenuKind.COLLEC
  addMenuActionSet(ContextMenuKind.PROCESS_ADMIN, processResourceAdminActionSet);
  addMenuActionSet(ContextMenuKind.PROJECT_ADMIN, projectAdminActionSet);
  
+ storeRedirects();
+ 
  fetchConfig()
      .then(({ config, apiHost }) => {
          const history = createBrowserHistory();
@@@ -122,7 -127,7 +125,7 @@@
                  }
              }
          });
-         const store = configureStore(history, services);
+         const store = configureStore(history, services, config);
  
          store.subscribe(initListener(history, store, services, config));
          store.dispatch(initAuth(config));