From: Stephen Smith <stephen@curii.com>
Date: Mon, 4 Apr 2022 21:31:00 +0000 (-0400)
Subject: Merge branch '18559-user-profile' into main. Closes #18559
X-Git-Tag: 2.4.0~1
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/41f6f1e495c82fcfa79b87cf718fa2e9cd91c726

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

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

41f6f1e495c82fcfa79b87cf718fa2e9cd91c726
diff --cc src/components/icon/icon.tsx
index 557e22e7,4d17dd28..19b4beea
--- a/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/routes.ts
index d7257b51,205ae08f..50689ec3
--- a/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/navigation/navigation-action.ts
index 49f56591,776409c0..1cdb6784
--- a/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';