Merge branch 'master' into 14565-admin-managing-user

refs #14565

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --combined src/views/workbench/workbench.tsx
index 6c7c24386205310611b65b3df22029911c8602c0,90b2dad0197215578d8020b1da153d7d38c9e88e..cca374d6738e9645f5183871252a20d66311a979
--- 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 { SiteManagerPanel } from "~/views/site-manager-panel/site-manager-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';
@@@ -79,8 -80,6 +80,8 @@@ import { UserPanel } from '~/views/user
  import { UserAttributesDialog } from '~/views-components/user-dialog/attributes-dialog';
  import { CreateUserDialog } from '~/views-components/dialog-forms/create-user-dialog';
  import { HelpApiClientAuthorizationDialog } from '~/views-components/api-client-authorizations-dialog/help-dialog';
 +import { UserManageDialog } from '~/views-components/user-dialog/manage-dialog';
 +import { SetupShellAccountDialog } from '~/views-components/dialog-forms/setup-shell-account-dialog';
  import { GroupsPanel } from '~/views/groups-panel/groups-panel';
  import { CreateGroupDialog } from '~/views-components/dialog-forms/create-group-dialog';
  import { RemoveGroupDialog } from '~/views-components/groups-dialog/remove-dialog';
@@@ -163,6 -162,7 +164,7 @@@ export const WorkbenchPanel 
                                  <Route path={Routes.REPOSITORIES} component={RepositoriesPanel} />
                                  <Route path={Routes.SSH_KEYS_USER} component={SshKeyPanel} />
                                  <Route path={Routes.SSH_KEYS_ADMIN} component={SshKeyPanel} />
+                                 <Route path={Routes.SITE_MANAGER} component={SiteManagerPanel} />
                                  <Route path={Routes.KEEP_SERVICES} component={KeepServicePanel} />
                                  <Route path={Routes.USERS} component={UserPanel} />
                                  <Route path={Routes.COMPUTE_NODES} component={ComputeNodePanel} />
@@@ -225,14 -225,12 +227,14 @@@
              <RepositoryAttributesDialog />
              <RepositoriesSampleGitDialog />
              <RichTextEditorDialog />
 +            <SetupShellAccountDialog />
              <SharingDialog />
              <Snackbar />
              <UpdateCollectionDialog />
              <UpdateProcessDialog />
              <UpdateProjectDialog />
              <UserAttributesDialog />
 +            <UserManageDialog />
              <VirtualMachineAttributesDialog />
          </Grid>
-     );
+     );