Merge branch '18559-user-profile' into main. Closes #18559

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

diff --cc src/components/icon/icon.tsx
index 557e22e77c959e08107ca10b11e174e13a967c30,4d17dd2863f6491a02540f0076b88d965e25cee2..19b4beea1eb66274f45c2fc8ba1f1879a3194333
--- 1/src/components/icon/icon.tsx
--- 2/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@@ -65,9 -65,11 +65,14 @@@ import VpnKey from '@material-ui/icons/
  import LinkOutlined from '@material-ui/icons/LinkOutlined';
  import RemoveRedEye from '@material-ui/icons/RemoveRedEye';
  import Computer from '@material-ui/icons/Computer';
 +import WrapText from '@material-ui/icons/WrapText';
 +import TextIncrease from '@material-ui/icons/ZoomIn';
 +import TextDecrease from '@material-ui/icons/ZoomOut';
+ import CropFreeSharp from '@material-ui/icons/CropFreeSharp';
+ import ExitToApp from '@material-ui/icons/ExitToApp';
+ import CheckCircleOutline from '@material-ui/icons/CheckCircleOutline';
+ import RemoveCircleOutline from '@material-ui/icons/RemoveCircleOutline';
+ import NotInterested from '@material-ui/icons/NotInterested';
  
  // Import FontAwesome icons
  import { library } from '@fortawesome/fontawesome-svg-core';
@@@ -176,6 -177,8 +180,11 @@@ export const CanReadIcon: IconType = (p
  export const CanWriteIcon: IconType = (props) => <Edit {...props} />;
  export const CanManageIcon: IconType = (props) => <Computer {...props} />;
  export const AddUserIcon: IconType = (props) => <PersonAdd {...props} />;
 +export const WordWrapIcon: IconType = (props) => <WrapText {...props} />;
 +export const TextIncreaseIcon: IconType = (props) => <TextIncrease {...props} />;
 +export const TextDecreaseIcon: IconType = (props) => <TextDecrease {...props} />;
+ export const DeactivateUserIcon: IconType = (props) => <NotInterested {...props} />;
+ export const LoginAsIcon: IconType = (props) => <ExitToApp {...props} />;
+ export const ActiveIcon: IconType = (props) => <CheckCircleOutline {...props} />;
+ export const SetupIcon: IconType = (props) => <RemoveCircleOutline {...props} />;
+ export const InactiveIcon: IconType = (props) => <NotInterested {...props} />;

diff --cc src/routes/route-change-handlers.ts
Simple merge

diff --cc src/routes/routes.ts
index d7257b5124b38fc0f71ef392d52102ec7b52825e,205ae08fdd3c21978dddb1cc8316d3512d9e0ad8..50689ec37c46ac1fba6d5ff985badeb233944031
--- 1/src/routes/routes.ts
--- 2/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@@ -94,8 -96,12 +95,10 @@@ export const getNavUrl = (uuid: string
  
  export const getProcessUrl = (uuid: string) => `/processes/${uuid}`;
  
 -export const getProcessLogUrl = (uuid: string) => `/process-logs/${uuid}`;
 -
  export const getGroupUrl = (uuid: string) => `/group/${uuid}`;
  
+ export const getUserProfileUrl = (uuid: string) => `/user/${uuid}`;
+ 
  export interface ResourceRouteParams {
      id: string;
  }

diff --cc src/store/context-menu/context-menu-actions.ts
Simple merge

diff --cc src/store/navigation/navigation-action.ts
index 49f565911e0b04230502be62c7032b2918a16d11,776409c01a1969604aa2d55898c84fd84c94a613..1cdb6784bf42390c88ef60fa920a76c773ab71c8
--- 1/src/store/navigation/navigation-action.ts
--- 2/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@@ -6,7 -6,7 +6,7 @@@ import { Dispatch, compose, AnyAction 
  import { push } from "react-router-redux";
  import { ResourceKind, extractUuidKind } from 'models/resource';
  import { SidePanelTreeCategory } from '../side-panel-tree/side-panel-tree-actions';
- import { Routes, getGroupUrl, getNavUrl } from 'routes/routes';
 -import { Routes, getProcessLogUrl, getGroupUrl, getNavUrl, getUserProfileUrl } from 'routes/routes';
++import { Routes, getGroupUrl, getNavUrl, getUserProfileUrl } from 'routes/routes';
  import { RootState } from 'store/store';
  import { ServiceRepository } from 'services/services';
  import { pluginConfig } from 'plugins';

diff --cc src/store/workbench/workbench-actions.ts
Simple merge

diff --cc src/views/workbench/workbench.tsx
Simple merge