16848: Renames 'current token dialog' code to 'token dialog'.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/src/index.tsx b/src/index.tsx
index 98281b67d9ff5cfb4bca863ea7b5b5f2dd8ce27d..b32066a46c69c37a9185bece05294319b6453fbc 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -36,7 +36,7 @@ import { ServiceRepository } from '~/services/services';
 import { initWebSocket } from '~/websocket/websocket';
 import { Config } from '~/common/config';
 import { addRouteChangeHandlers } from './routes/route-change-handlers';
 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';
+import { setTokenDialogApiHost } from '~/store/token-dialog/token-dialog-actions';

 import { processResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set';
 import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
 import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';
 import { processResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set';
 import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
 import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';


@@ -130,7 +130,7 @@ fetchConfig()
         store.subscribe(initListener(history, store, services, config));
         store.dispatch(initAuth(config));
         store.dispatch(setBuildInfo());
         store.subscribe(initListener(history, store, services, config));
         store.dispatch(initAuth(config));
         store.dispatch(setBuildInfo());

-        store.dispatch(setCurrentTokenDialogApiHost(apiHost));
+        store.dispatch(setTokenDialogApiHost(apiHost));

         store.dispatch(loadVocabulary);
         store.dispatch(loadFileViewersConfig);
 
         store.dispatch(loadVocabulary);
         store.dispatch(loadFileViewersConfig);
 

diff --git a/src/store/current-token-dialog/current-token-dialog-actions.tsx b/src/store/token-dialog/token-dialog-actions.tsx
similarity index 56%
rename from src/store/current-token-dialog/current-token-dialog-actions.tsx
rename to src/store/token-dialog/token-dialog-actions.tsx
index fe8186b7c9c4eb21abb7006a68b09de64855863a..08a45992e00a18726ac3842c48cc3c332ea8139f 100644 (file)
--- a/src/store/current-token-dialog/current-token-dialog-actions.tsx
+++ b/src/store/token-dialog/token-dialog-actions.tsx
@@ -7,20 +7,20 @@ import { getProperty } from '~/store/properties/properties';
 import { propertiesActions } from '~/store/properties/properties-actions';
 import { RootState } from '~/store/store';
 
 import { propertiesActions } from '~/store/properties/properties-actions';
 import { RootState } from '~/store/store';
 

-export const CURRENT_TOKEN_DIALOG_NAME = 'currentTokenDialog';
+export const TOKEN_DIALOG_NAME = 'tokenDialog';

 const API_HOST_PROPERTY_NAME = 'apiHost';
 
 const API_HOST_PROPERTY_NAME = 'apiHost';
 

-export interface CurrentTokenDialogData {
-    currentToken: string;
+export interface TokenDialogData {
+    token: string;

     apiHost: string;
 }
 
     apiHost: string;
 }
 

-export const setCurrentTokenDialogApiHost = (apiHost: string) =>
+export const setTokenDialogApiHost = (apiHost: string) =>

     propertiesActions.SET_PROPERTY({ key: API_HOST_PROPERTY_NAME, value: apiHost });
 
     propertiesActions.SET_PROPERTY({ key: API_HOST_PROPERTY_NAME, value: apiHost });
 

-export const getCurrentTokenDialogData = (state: RootState): CurrentTokenDialogData => ({
+export const getTokenDialogData = (state: RootState): TokenDialogData => ({

     apiHost: getProperty<string>(API_HOST_PROPERTY_NAME)(state.properties) || '',
     apiHost: getProperty<string>(API_HOST_PROPERTY_NAME)(state.properties) || '',

-    currentToken: state.auth.apiToken || '',
+    token: state.auth.apiToken || '',

 });
 
 });
 

-export const openCurrentTokenDialog = dialogActions.OPEN_DIALOG({ id: CURRENT_TOKEN_DIALOG_NAME, data: {} });
+export const openTokenDialog = dialogActions.OPEN_DIALOG({ id: TOKEN_DIALOG_NAME, data: {} });

diff --git a/src/views-components/main-app-bar/account-menu.tsx b/src/views-components/main-app-bar/account-menu.tsx
index 6e844cc8e2337001deaa0495eee9d15800de9082..58ed7b849a1def7154c5d0073538115ab45d2dea 100644 (file)
--- a/src/views-components/main-app-bar/account-menu.tsx
+++ b/src/views-components/main-app-bar/account-menu.tsx
@@ -11,7 +11,7 @@ import { UserPanelIcon } from "~/components/icon/icon";
 import { DispatchProp, connect } from 'react-redux';
 import { authActions } from '~/store/auth/auth-action';
 import { RootState } from "~/store/store";
 import { DispatchProp, connect } from 'react-redux';
 import { authActions } from '~/store/auth/auth-action';
 import { RootState } from "~/store/store";

-import { openCurrentTokenDialog } from '~/store/current-token-dialog/current-token-dialog-actions';
+import { openTokenDialog } from '~/store/token-dialog/token-dialog-actions';

 import { openRepositoriesPanel } from "~/store/repositories/repositories-actions";
 import {
     navigateToSiteManager,
 import { openRepositoriesPanel } from "~/store/repositories/repositories-actions";
 import {
     navigateToSiteManager,


@@ -70,7 +70,7 @@ export const AccountMenuComponent =
             {user.isActive ? <>
                 <MenuItem onClick={() => dispatch(openUserVirtualMachines())}>Virtual Machines</MenuItem>
                 {!user.isAdmin && <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>}
             {user.isActive ? <>
                 <MenuItem onClick={() => dispatch(openUserVirtualMachines())}>Virtual Machines</MenuItem>
                 {!user.isAdmin && <MenuItem onClick={() => dispatch(openRepositoriesPanel())}>Repositories</MenuItem>}

-                <MenuItem onClick={() => dispatch(openCurrentTokenDialog)}>Current token</MenuItem>
+                <MenuItem onClick={() => dispatch(openTokenDialog)}>Get API token</MenuItem>

                 <MenuItem onClick={() => dispatch(navigateToSshKeysUser)}>Ssh Keys</MenuItem>
                 <MenuItem onClick={() => dispatch(navigateToSiteManager)}>Site Manager</MenuItem>
                 <MenuItem onClick={() => dispatch(navigateToMyAccount)}>My account</MenuItem>
                 <MenuItem onClick={() => dispatch(navigateToSshKeysUser)}>Ssh Keys</MenuItem>
                 <MenuItem onClick={() => dispatch(navigateToSiteManager)}>Site Manager</MenuItem>
                 <MenuItem onClick={() => dispatch(navigateToMyAccount)}>My account</MenuItem>

diff --git a/src/views-components/current-token-dialog/current-token-dialog.test.tsx b/src/views-components/token-dialog/token-dialog.test.tsx
similarity index 89%
rename from src/views-components/current-token-dialog/current-token-dialog.test.tsx
rename to src/views-components/token-dialog/token-dialog.test.tsx
index eb405e94a0ed6f7bf140f7afe0de4f6179eef0ee..e8df29b8cb4376c7c0b63c764c7a5f1434e7d8d4 100644 (file)
--- a/src/views-components/current-token-dialog/current-token-dialog.test.tsx
+++ b/src/views-components/token-dialog/token-dialog.test.tsx
@@ -7,7 +7,7 @@ import { Button } from '@material-ui/core';
 import { mount, configure } from 'enzyme';
 import * as Adapter from 'enzyme-adapter-react-16';
 import * as CopyToClipboard from 'react-copy-to-clipboard';
 import { mount, configure } from 'enzyme';
 import * as Adapter from 'enzyme-adapter-react-16';
 import * as CopyToClipboard from 'react-copy-to-clipboard';

-import { CurrentTokenDialogComponent } from './current-token-dialog';
+import { TokenDialogComponent } from './token-dialog';

 
 configure({ adapter: new Adapter() });
 
 
 configure({ adapter: new Adapter() });
 


@@ -30,7 +30,7 @@ describe('<CurrentTokenDialog />', () => {
 
   describe('copy to clipboard', () => {
     beforeEach(() => {
 
   describe('copy to clipboard', () => {
     beforeEach(() => {

-      wrapper = mount(<CurrentTokenDialogComponent {...props} />);
+      wrapper = mount(<TokenDialogComponent {...props} />);

     });
 
     it('should copy API TOKEN to the clipboard', () => {
     });
 
     it('should copy API TOKEN to the clipboard', () => {

diff --git a/src/views-components/current-token-dialog/current-token-dialog.tsx b/src/views-components/token-dialog/token-dialog.tsx
similarity index 85%
rename from src/views-components/current-token-dialog/current-token-dialog.tsx
rename to src/views-components/token-dialog/token-dialog.tsx
index 9cb08f8b825b49a487a3da86bc87e00176cb56a4..b0d5c67ef8c5943a9b8e0475deffef8b42c98a20 100644 (file)
--- a/src/views-components/current-token-dialog/current-token-dialog.tsx
+++ b/src/views-components/token-dialog/token-dialog.tsx
@@ -9,7 +9,7 @@ import { ArvadosTheme } from '~/common/custom-theme';
 import { withDialog } from '~/store/dialog/with-dialog';
 import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { connect, DispatchProp } from 'react-redux';
 import { withDialog } from '~/store/dialog/with-dialog';
 import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { connect, DispatchProp } from 'react-redux';

-import { CurrentTokenDialogData, getCurrentTokenDialogData, CURRENT_TOKEN_DIALOG_NAME } from '~/store/current-token-dialog/current-token-dialog-actions';
+import { TokenDialogData, getTokenDialogData, TOKEN_DIALOG_NAME } from '~/store/token-dialog/token-dialog-actions';

 import { DefaultCodeSnippet } from '~/components/default-code-snippet/default-code-snippet';
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
 
 import { DefaultCodeSnippet } from '~/components/default-code-snippet/default-code-snippet';
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
 


@@ -38,9 +38,9 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     }
 });
 
     }
 });
 

-type CurrentTokenProps = CurrentTokenDialogData & WithDialogProps<{}> & WithStyles<CssRules> & DispatchProp;
+type TokenDialogProps = TokenDialogData & WithDialogProps<{}> & WithStyles<CssRules> & DispatchProp;

 
 

-export class CurrentTokenDialogComponent extends React.Component<CurrentTokenProps> {
+export class TokenDialogComponent extends React.Component<TokenDialogProps> {

     onCopy = (message: string) => {
         this.props.dispatch(snackbarActions.OPEN_SNACKBAR({
             message,
     onCopy = (message: string) => {
         this.props.dispatch(snackbarActions.OPEN_SNACKBAR({
             message,


@@ -49,9 +49,9 @@ export class CurrentTokenDialogComponent extends React.Component<CurrentTokenPro
         }));
     }
 
         }));
     }
 

-    getSnippet = ({ apiHost, currentToken }: CurrentTokenDialogData) =>
+    getSnippet = ({ apiHost, token }: TokenDialogData) =>

         `HISTIGNORE=$HISTIGNORE:'export ARVADOS_API_TOKEN=*'
         `HISTIGNORE=$HISTIGNORE:'export ARVADOS_API_TOKEN=*'

-export ARVADOS_API_TOKEN=${currentToken}
+export ARVADOS_API_TOKEN=${token}

 export ARVADOS_API_HOST=${apiHost}
 unset ARVADOS_API_HOST_INSECURE`
 
 export ARVADOS_API_HOST=${apiHost}
 unset ARVADOS_API_HOST_INSECURE`
 


@@ -63,7 +63,7 @@ unset ARVADOS_API_HOST_INSECURE`
             onClose={closeDialog}
             fullWidth={true}
             maxWidth='md'>
             onClose={closeDialog}
             fullWidth={true}
             maxWidth='md'>

-            <DialogTitle>Current Token</DialogTitle>
+            <DialogTitle>Get API Token</DialogTitle>

             <DialogContent>
                 <Typography paragraph={true}>
                     The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados with the proper permissions.
             <DialogContent>
                 <Typography paragraph={true}>
                     The Arvados API token is a secret key that enables the Arvados SDKs to access Arvados with the proper permissions.


@@ -101,8 +101,8 @@ unset ARVADOS_API_HOST_INSECURE`
     }
 }
 
     }
 }
 

-export const CurrentTokenDialog =
+export const TokenDialog =

     withStyles(styles)(
     withStyles(styles)(

-        connect(getCurrentTokenDialogData)(
-            withDialog(CURRENT_TOKEN_DIALOG_NAME)(CurrentTokenDialogComponent)));
+        connect(getTokenDialogData)(
+            withDialog(TOKEN_DIALOG_NAME)(TokenDialogComponent)));

 
 

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index f5cfda89828e8164c758061ec6c41b2a99c94ea6..9c2a7df8ffd547c7ab8f15f2dc62c875cb91087f 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -10,7 +10,7 @@ import { DetailsPanel } from '~/views-components/details-panel/details-panel';
 import { ArvadosTheme } from '~/common/custom-theme';
 import { ContextMenu } from "~/views-components/context-menu/context-menu";
 import { FavoritePanel } from "../favorite-panel/favorite-panel";
 import { ArvadosTheme } from '~/common/custom-theme';
 import { ContextMenu } from "~/views-components/context-menu/context-menu";
 import { FavoritePanel } from "../favorite-panel/favorite-panel";

-import { CurrentTokenDialog } from '~/views-components/current-token-dialog/current-token-dialog';
+import { TokenDialog } from '~/views-components/token-dialog/token-dialog';

 import { RichTextEditorDialog } from '~/views-components/rich-text-editor-dialog/rich-text-editor-dialog';
 import { Snackbar } from '~/views-components/snackbar/snackbar';
 import { CollectionPanel } from '../collection-panel/collection-panel';
 import { RichTextEditorDialog } from '~/views-components/rich-text-editor-dialog/rich-text-editor-dialog';
 import { Snackbar } from '~/views-components/snackbar/snackbar';
 import { CollectionPanel } from '../collection-panel/collection-panel';


@@ -221,7 +221,7 @@ export const WorkbenchPanel =
             <CreateRepositoryDialog />
             <CreateSshKeyDialog />
             <CreateUserDialog />
             <CreateRepositoryDialog />
             <CreateSshKeyDialog />
             <CreateUserDialog />

-            <CurrentTokenDialog />
+            <TokenDialog />

             <FileRemoveDialog />
             <FilesUploadCollectionDialog />
             <GroupAttributesDialog />
             <FileRemoveDialog />
             <FilesUploadCollectionDialog />
             <GroupAttributesDialog />