X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8dd64fbb819524cb3f86f5313b44fe228a20165d..3c7e3cdc547ad5468421e1c049daa94b0d4b8bc0:/src/views/site-manager-panel/site-manager-panel-root.tsx diff --git a/src/views/site-manager-panel/site-manager-panel-root.tsx b/src/views/site-manager-panel/site-manager-panel-root.tsx index 223e373c..45f0a116 100644 --- a/src/views/site-manager-panel/site-manager-panel-root.tsx +++ b/src/views/site-manager-panel/site-manager-panel-root.tsx @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; +import React from 'react'; import { Card, CardContent, @@ -19,17 +19,17 @@ import { WithStyles, withStyles } from '@material-ui/core'; -import { ArvadosTheme } from '~/common/custom-theme'; -import { Session, SessionStatus } from "~/models/session"; +import { ArvadosTheme } from 'common/custom-theme'; +import { Session, SessionStatus } from "models/session"; import Button from "@material-ui/core/Button"; import { compose, Dispatch } from "redux"; import { Field, FormErrors, InjectedFormProps, reduxForm, reset, stopSubmit } from "redux-form"; -import { TextField } from "~/components/text-field/text-field"; -import { addSession } from "~/store/auth/auth-action-session"; -import { SITE_MANAGER_REMOTE_HOST_VALIDATION } from "~/validators/validators"; -import { Config } from '~/common/config'; -import { ResourceCluster } from '~/views-components/data-explorer/renderers'; -import { TrashIcon } from "~/components/icon/icon"; +import { TextField } from "components/text-field/text-field"; +import { addSession } from "store/auth/auth-action-session"; +import { SITE_MANAGER_REMOTE_HOST_VALIDATION } from "validators/validators"; +import { Config } from 'common/config'; +import { ResourceCluster } from 'views-components/data-explorer/renderers'; +import { TrashIcon } from "components/icon/icon"; type CssRules = 'root' | 'link' | 'buttonContainer' | 'table' | 'tableRow' | 'remoteSiteInfo' | 'buttonAdd' | 'buttonLoggedIn' | 'buttonLoggedOut' | @@ -158,7 +158,10 @@ export const SiteManagerPanelRoot = compose( disabled={validating || session.status === SessionStatus.INVALIDATED || session.active} className={session.loggedIn ? classes.buttonLoggedIn : classes.buttonLoggedOut} onClick={() => toggleSession(session)}> - {validating ? "Validating" : (session.loggedIn ? "Logged in" : "Logged out")} + {validating ? "Validating" + : (session.loggedIn ? + (session.userIsActive ? "Logged in" : "Inactive") + : "Logged out")}