Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14500_admin_api_tokens

refs #2
14500

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

diff --combined src/routes/route-change-handlers.ts
index 1a88ff20f956e81efe66e8a6f7926f47247075f8,68de3107f1a82bb219fb49e883c27682c486902f..a733e42f7e902a7aa912ff9482de9e000627b0b3
--- 1/src/routes/route-change-handlers.ts
--- 2/src/routes/route-change-handlers.ts
+++ b/src/routes/route-change-handlers.ts
@@@ -31,7 -31,7 +31,8 @@@ const handleLocationChange = (store: Ro
      const sshKeysMatch = Routes.matchSshKeysRoute(pathname);
      const keepServicesMatch = Routes.matchKeepServicesRoute(pathname);
      const computeNodesMatch = Routes.matchComputeNodesRoute(pathname);
 +    const apiClientAuthorizationsMatch = Routes.matchApiClientAuthorizationsRoute(pathname);
+     const myAccountMatch = Routes.matchMyAccountRoute(pathname);
  
      if (projectMatch) {
          store.dispatch(WorkbenchActions.loadProject(projectMatch.params.id));
@@@ -65,7 -65,7 +66,9 @@@
          store.dispatch(WorkbenchActions.loadKeepServices);
      } else if (computeNodesMatch) {
          store.dispatch(WorkbenchActions.loadComputeNodes);
 +    } else if (apiClientAuthorizationsMatch) {
 +        store.dispatch(WorkbenchActions.loadApiClientAuthorizations);
+     } else if (myAccountMatch) {
+         store.dispatch(WorkbenchActions.loadMyAccount);
      }
  };

diff --combined src/routes/routes.ts
index 1fda25d0afca45853b6a8eadd3fd24a27fc04cfe,71d920ab3e4d984dcf126a5aaf6b439431dde9d7..7f15a8de74bb52c47e67a5f1e608a1e3ab0df9cf
--- 1/src/routes/routes.ts
--- 2/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@@ -23,9 -23,9 +23,10 @@@ export const Routes = 
      WORKFLOWS: '/workflows',
      SEARCH_RESULTS: '/search-results',
      SSH_KEYS: `/ssh-keys`,
+     MY_ACCOUNT: '/my-account',
      KEEP_SERVICES: `/keep-services`,
 -    COMPUTE_NODES: `/nodes`
 +    COMPUTE_NODES: `/nodes`,
 +    API_CLIENT_AUTHORIZATIONS: `/api_client_authorizations`
  };
  
  export const getResourceUrl = (uuid: string) => {
@@@ -92,11 -92,11 +93,14 @@@ export const matchRepositoriesRoute = (
  export const matchSshKeysRoute = (route: string) =>
      matchPath(route, { path: Routes.SSH_KEYS });
  
+ export const matchMyAccountRoute = (route: string) =>
+     matchPath(route, { path: Routes.MY_ACCOUNT });
+ 
  export const matchKeepServicesRoute = (route: string) =>
      matchPath(route, { path: Routes.KEEP_SERVICES });
  
  export const matchComputeNodesRoute = (route: string) =>
 -    matchPath(route, { path: Routes.COMPUTE_NODES });
 +    matchPath(route, { path: Routes.COMPUTE_NODES });
 +
 +export const matchApiClientAuthorizationsRoute = (route: string) =>
 +    matchPath(route, { path: Routes.API_CLIENT_AUTHORIZATIONS });

diff --combined src/store/navigation/navigation-action.ts
index e1e8cef557e1af4a6879ae60f2180ce4dd784877,a3652726f1d2dfda5b51d8c1f5200ebf1bbd6b71..067a9ac487f0869e038c00b67cd75c8f1f9d2985
--- 1/src/store/navigation/navigation-action.ts
--- 2/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@@ -68,8 -68,8 +68,10 @@@ export const navigateToRepositories = p
  
  export const navigateToSshKeys= push(Routes.SSH_KEYS);
  
+ export const navigateToMyAccount = push(Routes.MY_ACCOUNT);
+ 
  export const navigateToKeepServices = push(Routes.KEEP_SERVICES);
  
 -export const navigateToComputeNodes = push(Routes.COMPUTE_NODES);
 +export const navigateToComputeNodes = push(Routes.COMPUTE_NODES);
 +
 +export const navigateToApiClientAuthorizations = push(Routes.API_CLIENT_AUTHORIZATIONS);

diff --combined src/store/workbench/workbench-actions.ts
index 6e823be698536530f889c4f69bfa7e53b9e416fb,49c50f288982c2140243948b2ccc17dcda46aa3b..fdc91f43d51fd9bfa8aaea918c258391ed06fe3b
--- 1/src/store/workbench/workbench-actions.ts
--- 2/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@@ -40,6 -40,7 +40,7 @@@ import { loadSharedWithMePanel } from '
  import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
  import { loadWorkflowPanel, workflowPanelActions } from '~/store/workflow-panel/workflow-panel-actions';
  import { loadSshKeysPanel } from '~/store/auth/auth-action';
+ import { loadMyAccountPanel } from '~/store/my-account/my-account-panel-actions';
  import { workflowPanelColumns } from '~/views/workflow-panel/workflow-panel-view';
  import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
  import { getProgressIndicator } from '~/store/progress-indicator/progress-indicator-reducer';
@@@ -58,7 -59,6 +59,7 @@@ import { loadVirtualMachinesPanel } fro
  import { loadRepositoriesPanel } from '~/store/repositories/repositories-actions';
  import { loadKeepServicesPanel } from '~/store/keep-services/keep-services-actions';
  import { loadComputeNodesPanel } from '~/store/compute-nodes/compute-nodes-actions';
 +import { loadApiClientAuthorizationsPanel } from '~/store/api-client-authorizations/api-client-authorizations-actions';
  
  export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
  
@@@ -413,6 -413,11 +414,11 @@@ export const loadSshKeys = handleFirstT
          await dispatch(loadSshKeysPanel());
      });
  
+ export const loadMyAccount = handleFirstTimeLoad(
+     (dispatch: Dispatch<any>) => {
+         dispatch(loadMyAccountPanel());
+     });
+ 
  export const loadKeepServices = handleFirstTimeLoad(
      async (dispatch: Dispatch<any>) => {
          await dispatch(loadKeepServicesPanel());
@@@ -423,11 -428,6 +429,11 @@@ export const loadComputeNodes = handleF
          await dispatch(loadComputeNodesPanel());
      });
  
 +export const loadApiClientAuthorizations = handleFirstTimeLoad(
 +    async (dispatch: Dispatch<any>) => {
 +        await dispatch(loadApiClientAuthorizationsPanel());
 +    });
 +
  const finishLoadingProject = (project: GroupContentsResource | string) =>
      async (dispatch: Dispatch<any>) => {
          const uuid = typeof project === 'string' ? project : project.uuid;

diff --combined src/views-components/main-app-bar/account-menu.tsx
index f385b9f600143d6748f5a5b20d13bea4a435fa22,ee726f3d75ec5a603acbf80c0708be9085b59316..415cba37c97b543da6ee41d4cb7dccce6f91a6c6
--- 1/src/views-components/main-app-bar/account-menu.tsx
--- 2/src/views-components/main-app-bar/account-menu.tsx
+++ b/src/views-components/main-app-bar/account-menu.tsx
@@@ -12,10 -12,7 +12,10 @@@ import { logout } from '~/store/auth/au
  import { RootState } from "~/store/store";
  import { openCurrentTokenDialog } from '~/store/current-token-dialog/current-token-dialog-actions';
  import { openRepositoriesPanel } from "~/store/repositories/repositories-actions";
 -import { navigateToSshKeys, navigateToKeepServices, navigateToComputeNodes, navigateToMyAccount } from '~/store/navigation/navigation-action';
 +import { 
 +    navigateToSshKeys, navigateToKeepServices, navigateToComputeNodes,
-     navigateToApiClientAuthorizations
++    navigateToApiClientAuthorizations, navigateToMyAccount
 +} from '~/store/navigation/navigation-action';
  import { openVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions";
  
  interface AccountMenuProps {
@@@ -40,10 -37,9 +40,10 @@@ export const AccountMenu = connect(mapS
                  <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>
                  <MenuItem onClick={() => dispatch(openCurrentTokenDialog)}>Current token</MenuItem>
                  <MenuItem onClick={() => dispatch(navigateToSshKeys)}>Ssh Keys</MenuItem>
 +                { user.isAdmin && <MenuItem onClick={() => dispatch(navigateToApiClientAuthorizations)}>Api Tokens</MenuItem> }
                  { user.isAdmin && <MenuItem onClick={() => dispatch(navigateToKeepServices)}>Keep Services</MenuItem> }
                  { user.isAdmin && <MenuItem onClick={() => dispatch(navigateToComputeNodes)}>Compute Nodes</MenuItem> }
-                 <MenuItem>My account</MenuItem>
+                 <MenuItem onClick={() => dispatch(navigateToMyAccount)}>My account</MenuItem>
                  <MenuItem onClick={() => dispatch(logout())}>Logout</MenuItem>
              </DropdownMenu>
              : null);

diff --combined src/views/workbench/workbench.tsx
index 1f5a5035ec8de68b43a41ba14f986fe532b1e9ab,5efffa19ac26b705233cd24c3fb4e08578a6c32f..3cd040f78c6aeec4819c92dd5db500a1495ab9e0
--- 1/src/views/workbench/workbench.tsx
--- 2/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -45,6 -45,7 +45,7 @@@ import SplitterLayout from 'react-split
  import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel';
  import { SearchResultsPanel } from '~/views/search-results-panel/search-results-panel';
  import { SshKeyPanel } from '~/views/ssh-key-panel/ssh-key-panel';
+ import { MyAccountPanel } from '~/views/my-account-panel/my-account-panel';
  import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog';
  import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog';
  import { ProcessInputDialog } from '~/views-components/process-input-dialog/process-input-dialog';
@@@ -53,24 -54,20 +54,24 @@@ import { ProjectPropertiesDialog } fro
  import { RepositoriesPanel } from '~/views/repositories-panel/repositories-panel';
  import { KeepServicePanel } from '~/views/keep-service-panel/keep-service-panel';
  import { ComputeNodePanel } from '~/views/compute-node-panel/compute-node-panel';
 +import { ApiClientAuthorizationPanel } from '~/views/api-client-authorization-panel/api-client-authorization-panel';
  import { RepositoriesSampleGitDialog } from '~/views-components/repositories-sample-git-dialog/repositories-sample-git-dialog';
  import { RepositoryAttributesDialog } from '~/views-components/repository-attributes-dialog/repository-attributes-dialog';
  import { CreateRepositoryDialog } from '~/views-components/dialog-forms/create-repository-dialog';
  import { RemoveRepositoryDialog } from '~/views-components/repository-remove-dialog/repository-remove-dialog';
  import { CreateSshKeyDialog } from '~/views-components/dialog-forms/create-ssh-key-dialog';
  import { PublicKeyDialog } from '~/views-components/ssh-keys-dialog/public-key-dialog';
 +import { RemoveApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/remove-dialog';
  import { RemoveComputeNodeDialog } from '~/views-components/compute-nodes-dialog/remove-dialog';
  import { RemoveKeepServiceDialog } from '~/views-components/keep-services-dialog/remove-dialog';
  import { RemoveSshKeyDialog } from '~/views-components/ssh-keys-dialog/remove-dialog';
  import { RemoveVirtualMachineDialog } from '~/views-components/virtual-machines-dialog/remove-dialog';
 +import { AttributesApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/attributes-dialog';
  import { AttributesComputeNodeDialog } from '~/views-components/compute-nodes-dialog/attributes-dialog';
  import { AttributesKeepServiceDialog } from '~/views-components/keep-services-dialog/attributes-dialog';
  import { AttributesSshKeyDialog } from '~/views-components/ssh-keys-dialog/attributes-dialog';
  import { VirtualMachineAttributesDialog } from '~/views-components/virtual-machines-dialog/attributes-dialog';
 +import { HelpApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/help-dialog';
  
  type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
  
@@@ -145,7 -142,7 +146,8 @@@ export const WorkbenchPanel 
                                  <Route path={Routes.SSH_KEYS} component={SshKeyPanel} />
                                  <Route path={Routes.KEEP_SERVICES} component={KeepServicePanel} />
                                  <Route path={Routes.COMPUTE_NODES} component={ComputeNodePanel} />
 +                                <Route path={Routes.API_CLIENT_AUTHORIZATIONS} component={ApiClientAuthorizationPanel} />
+                                 <Route path={Routes.MY_ACCOUNT} component={MyAccountPanel} />
                              </Switch>
                          </Grid>
                      </Grid>
@@@ -155,7 -152,6 +157,7 @@@
                  <DetailsPanel />
              </Grid>
              <AdvancedTabDialog />
 +            <AttributesApiClientAuthorizationDialog />
              <AttributesComputeNodeDialog />
              <AttributesKeepServiceDialog />
              <AttributesSshKeyDialog />
@@@ -170,7 -166,6 +172,7 @@@
              <CurrentTokenDialog />
              <FileRemoveDialog />
              <FilesUploadCollectionDialog />
 +            <HelpApiClientAuthorizationDialog />
              <MoveCollectionDialog />
              <MoveProcessDialog />
              <MoveProjectDialog />
@@@ -180,7 -175,6 +182,7 @@@
              <ProcessCommandDialog />
              <ProcessInputDialog />
              <ProjectPropertiesDialog />
 +            <RemoveApiClientAuthorizationDialog />
              <RemoveComputeNodeDialog />
              <RemoveKeepServiceDialog />
              <RemoveProcessDialog />