[ARVADOS-WORKBENCH2] updated: 1.2.0-327-gd171dc7
Git user
git at public.curoverse.com
Fri Sep 7 03:36:47 EDT 2018
Summary of changes:
src/common/config.ts | 6 +-
src/components/code-snippet/code-snippet.tsx | 2 +-
.../default-code-snippet/default-code-snippet.tsx | 2 +-
src/index.tsx | 4 +-
.../current-token-dialog-actions.tsx | 26 ++++++
.../current-token-dialog/current-token-dialog.tsx | 99 ++++++++++------------
src/views-components/main-app-bar/account-menu.tsx | 3 +-
src/views/workbench/workbench.tsx | 12 +--
8 files changed, 84 insertions(+), 70 deletions(-)
create mode 100644 src/store/current-token-dialog/current-token-dialog-actions.tsx
via d171dc7d61d9ab3d952bb5038b2d47dbeaaa8ba2 (commit)
from 23b0c2abcd8913e6518f21c2c6a399751455cda0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit d171dc7d61d9ab3d952bb5038b2d47dbeaaa8ba2
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Fri Sep 7 09:36:28 2018 +0200
Restore current-token-dialog
Feature #14149
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/common/config.ts b/src/common/config.ts
index 061f9c0..1ab7329 100644
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -56,8 +56,10 @@ export const fetchConfig = () => {
.get<ConfigJSON>(CONFIG_URL + "?nocache=" + (new Date()).getTime())
.then(response => response.data)
.catch(() => Promise.resolve(getDefaultConfig()))
- .then(config => Axios.get<Config>(getDiscoveryURL(config.API_HOST)))
- .then(response => response.data);
+ .then(config => Axios
+ .get<Config>(getDiscoveryURL(config.API_HOST))
+ .then(response => ({ config: response.data, apiHost: config.API_HOST })));
+
};
export const mockConfig = (config: Partial<Config>): Config => ({
diff --git a/src/components/code-snippet/code-snippet.tsx b/src/components/code-snippet/code-snippet.tsx
index b622210..eb0e709 100644
--- a/src/components/code-snippet/code-snippet.tsx
+++ b/src/components/code-snippet/code-snippet.tsx
@@ -14,7 +14,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
width: '100%',
height: 'auto',
maxHeight: '550px',
- overflow: 'scroll',
+ overflow: 'auto',
padding: theme.spacing.unit
}
});
diff --git a/src/components/default-code-snippet/default-code-snippet.tsx b/src/components/default-code-snippet/default-code-snippet.tsx
index 541f390..b8c0a7b 100644
--- a/src/components/default-code-snippet/default-code-snippet.tsx
+++ b/src/components/default-code-snippet/default-code-snippet.tsx
@@ -19,7 +19,7 @@ const theme = createMuiTheme({
}
},
typography: {
- fontFamily: 'VT323'
+ fontFamily: 'monospace'
}
});
diff --git a/src/index.tsx b/src/index.tsx
index a921b47..e982b45 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -35,6 +35,7 @@ import { ServiceRepository } from '~/services/services';
import { initWebSocket } from '~/websocket/websocket';
import { Config } from '~/common/config';
import { addRouteChangeHandlers } from './routes/route-change-handlers';
+import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions';
const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
@@ -56,13 +57,14 @@ addMenuActionSet(ContextMenuKind.PROCESS, processActionSet);
addMenuActionSet(ContextMenuKind.TRASH, trashActionSet);
fetchConfig()
- .then((config) => {
+ .then(({ config, apiHost }) => {
const history = createBrowserHistory();
const services = createServices(config);
const store = configureStore(history, services);
store.subscribe(initListener(history, store, services, config));
store.dispatch(initAuth());
+ store.dispatch(setCurrentTokenDialogApiHost(apiHost));
const TokenComponent = (props: any) => <ApiToken authService={services.authService} {...props} />;
const WorkbenchComponent = (props: any) => <Workbench authService={services.authService} buildInfo={buildInfo} {...props} />;
diff --git a/src/store/current-token-dialog/current-token-dialog-actions.tsx b/src/store/current-token-dialog/current-token-dialog-actions.tsx
new file mode 100644
index 0000000..030b18e
--- /dev/null
+++ b/src/store/current-token-dialog/current-token-dialog-actions.tsx
@@ -0,0 +1,26 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { getProperty } from '../properties/properties';
+import { propertiesActions } from '~/store/properties/properties-actions';
+import { RootState } from '~/store/store';
+
+export const CURRENT_TOKEN_DIALOG_NAME = 'currentTokenDialog';
+const API_HOST_PROPERTY_NAME = 'apiHost';
+
+export interface CurrentTokenDialogData {
+ currentToken: string;
+ apiHost: string;
+}
+
+export const setCurrentTokenDialogApiHost = (apiHost: string) =>
+ propertiesActions.SET_PROPERTY({ key: API_HOST_PROPERTY_NAME, value: apiHost });
+
+export const getCurrentTokenDialogData = (state: RootState): CurrentTokenDialogData => ({
+ apiHost: getProperty<string>(API_HOST_PROPERTY_NAME)(state.properties) || '',
+ currentToken: state.auth.apiToken || '',
+});
+
+export const openCurrentTokenDialog = dialogActions.OPEN_DIALOG({ id: CURRENT_TOKEN_DIALOG_NAME, data: {} });
diff --git a/src/views-components/current-token-dialog/current-token-dialog.tsx b/src/views-components/current-token-dialog/current-token-dialog.tsx
index fca9f05..ba6c325 100644
--- a/src/views-components/current-token-dialog/current-token-dialog.tsx
+++ b/src/views-components/current-token-dialog/current-token-dialog.tsx
@@ -5,6 +5,13 @@
import * as React from 'react';
import { Dialog, DialogActions, DialogTitle, DialogContent, WithStyles, withStyles, StyleRulesCallback, Button, Typography, Paper } from '@material-ui/core';
import { ArvadosTheme } from '~/common/custom-theme';
+import { withDialog } from '~/store/dialog/with-dialog';
+import { WithDialogProps } from '~/store/dialog/with-dialog';
+import { compose } from 'redux';
+import { connect } from 'react-redux';
+import { CurrentTokenDialogData, getCurrentTokenDialogData } from '~/store/current-token-dialog/current-token-dialog-actions';
+import { RootState } from '~/store/store';
+import { DefaultCodeSnippet } from '~/components/default-code-snippet/default-code-snippet';
type CssRules = 'link' | 'paper' | 'button';
@@ -26,65 +33,51 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
}
});
-interface CurrentTokenDataProps {
- currentToken?: string;
- open: boolean;
-}
-
-interface CurrentTokenActionProps {
- handleClose: () => void;
-}
-
-type CurrentTokenProps = CurrentTokenDataProps & CurrentTokenActionProps & WithStyles<CssRules>;
-
-export const CurrentTokenDialog = withStyles(styles)(
- class extends React.Component<CurrentTokenProps> {
+type CurrentTokenProps = CurrentTokenDialogData & WithDialogProps<{}> & WithStyles<CssRules>;
- render() {
- const { classes, open, handleClose, currentToken } = this.props;
- return (
- <Dialog open={open} onClose={handleClose} fullWidth={true} maxWidth='md'>
- <DialogTitle>Current Token</DialogTitle>
- <DialogContent>
- <Typography variant='body1' paragraph={true}>
- The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados with the proper permissions.
+export const CurrentTokenDialog = compose(
+ withStyles(styles),
+ connect(getCurrentTokenDialogData),
+ withDialog('currentTokenDialog')
+)(class extends React.Component<CurrentTokenProps> {
+ render() {
+ const { classes, open, closeDialog, ...data } = this.props;
+ return <Dialog
+ open={open}
+ onClose={closeDialog}
+ fullWidth={true}
+ maxWidth='md'>
+ <DialogTitle>Current Token</DialogTitle>
+ <DialogContent>
+ <Typography variant='body1' paragraph={true}>
+ The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados with the proper permissions.
<Typography component='p'>
- For more information see
+ For more information see
<a href='http://doc.arvados.org/user/reference/api-tokens.html' target='blank' className={classes.link}>
- Getting an API token.
+ Getting an API token.
</a>
- </Typography>
+ </Typography>
+ </Typography>
+ <Typography variant='body1' paragraph={true}>
+ Paste the following lines at a shell prompt to set up the necessary environment for Arvados SDKs to authenticate to your klingenc account.
</Typography>
-
- <Typography variant='body1' paragraph={true}>
- Paste the following lines at a shell prompt to set up the necessary environment for Arvados SDKs to authenticate to your klingenc account.
- </Typography>
-
- <Paper className={classes.paper} elevation={0}>
- <Typography variant='body1'>
- HISTIGNORE=$HISTIGNORE:'export ARVADOS_API_TOKEN=*'
- </Typography>
- <Typography variant='body1'>
- export ARVADOS_API_TOKEN={currentToken}
- </Typography>
- <Typography variant='body1'>
- export ARVADOS_API_HOST=api.ardev.roche.com
- </Typography>
- <Typography variant='body1'>
- unset ARVADOS_API_HOST_INSECURE
- </Typography>
- </Paper>
- <Typography variant='body1'>
- Arvados
+ <DefaultCodeSnippet lines={[getSnippet(data)]} />
+ <Typography variant='body1'>
+ Arvados
<a href='http://doc.arvados.org/user/reference/api-tokens.html' target='blank' className={classes.link}>virtual machines</a>
- do this for you automatically. This setup is needed only when you use the API remotely (e.g., from your own workstation).
+ do this for you automatically. This setup is needed only when you use the API remotely (e.g., from your own workstation).
</Typography>
- </DialogContent>
- <DialogActions>
- <Button onClick={handleClose} className={classes.button} color="primary">CLOSE</Button>
- </DialogActions>
- </Dialog>
- );
- }
+ </DialogContent>
+ <DialogActions>
+ <Button onClick={closeDialog} className={classes.button} color="primary">CLOSE</Button>
+ </DialogActions>
+ </Dialog>;
}
+}
);
+
+const getSnippet = ({ apiHost, currentToken }: CurrentTokenDialogData) =>
+`HISTIGNORE=$HISTIGNORE:'export ARVADOS_API_TOKEN=*'
+export ARVADOS_API_TOKEN=${currentToken}
+export ARVADOS_API_HOST=${apiHost}
+unset ARVADOS_API_HOST_INSECURE`;
diff --git a/src/views-components/main-app-bar/account-menu.tsx b/src/views-components/main-app-bar/account-menu.tsx
index 2597c19..fdd8123 100644
--- a/src/views-components/main-app-bar/account-menu.tsx
+++ b/src/views-components/main-app-bar/account-menu.tsx
@@ -10,6 +10,7 @@ import { UserPanelIcon } from "~/components/icon/icon";
import { DispatchProp, connect } from 'react-redux';
import { logout } from "~/store/auth/auth-action";
import { RootState } from "~/store/store";
+import { openCurrentTokenDialog } from '../../store/current-token-dialog/current-token-dialog-actions';
interface AccountMenuProps {
user?: User;
@@ -29,7 +30,7 @@ export const AccountMenu = connect(mapStateToProps)(
<MenuItem>
{getUserFullname(user)}
</MenuItem>
- <MenuItem>Current token</MenuItem>
+ <MenuItem onClick={() => dispatch(openCurrentTokenDialog)}>Current token</MenuItem>
<MenuItem>My account</MenuItem>
<MenuItem onClick={() => dispatch(logout())}>Logout</MenuItem>
</DropdownMenu>
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 94ef7db..02b4abf 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -77,8 +77,6 @@ interface WorkbenchGeneralProps {
type WorkbenchProps = WorkbenchDataProps & WorkbenchGeneralProps & DispatchProp<any> & WithStyles<CssRules>;
interface WorkbenchState {
- isCurrentTokenDialogOpen: boolean;
- anchorEl: any;
searchText: string;
}
@@ -91,8 +89,6 @@ export const Workbench = withStyles(styles)(
)(
class extends React.Component<WorkbenchProps, WorkbenchState> {
state = {
- isCurrentTokenDialogOpen: false,
- anchorEl: null,
searchText: "",
};
@@ -159,10 +155,7 @@ export const Workbench = withStyles(styles)(
<UpdateProjectDialog />
<MoveCollectionDialog />
<MoveProjectDialog />
- <CurrentTokenDialog
- currentToken={this.props.currentToken}
- open={this.state.isCurrentTokenDialogOpen}
- handleClose={this.toggleCurrentTokenModal} />
+ <CurrentTokenDialog />
</>;
}
@@ -175,9 +168,6 @@ export const Workbench = withStyles(styles)(
this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
}
- toggleCurrentTokenModal = () => {
- this.setState({ isCurrentTokenDialogOpen: !this.state.isCurrentTokenDialogOpen });
- }
}
)
);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list