X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/18ff30c75321f3be6a9e02529af2b5e1f1a3ddb0..1feb5aaffe6fee4a9c8c8c64877f1da6f3490e06:/src/views/workbench/workbench.tsx

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 912ab87fd9..3637528d49 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -18,7 +18,7 @@ import { TreeItem } from "../../components/tree/tree";
 import { getTreePath } from '../../store/project/project-reducer';
 import { sidePanelActions } from '../../store/side-panel/side-panel-action';
 import { SidePanel, SidePanelItem } from '../../components/side-panel/side-panel';
-import { ItemMode, setFavoriteItem, setProjectItem } from "../../store/navigation/navigation-action";
+import { ItemMode, setProjectItem } from "../../store/navigation/navigation-action";
 import { projectActions } from "../../store/project/project-action";
 import { ProjectPanel } from "../project-panel/project-panel";
 import { DetailsPanel } from '../../views-components/details-panel/details-panel';
@@ -32,7 +32,10 @@ import { sidePanelData, SidePanelIdentifiers } from '../../store/side-panel/side
 import { ProjectResource } from '../../models/project';
 import { ResourceKind } from '../../models/resource';
 import { ContextMenu, ContextMenuKind } from "../../views-components/context-menu/context-menu";
-import { FavoritePanel } from "../favorite-panel/favorite-panel";
+import { FavoritePanel, FAVORITE_PANEL_ID } from "../favorite-panel/favorite-panel";
+import { CurrentTokenDialog } from '../../views-components/current-token-dialog/current-token-dialog';
+import { dataExplorerActions } from '../../store/data-explorer/data-explorer-action';
+import { Snackbar } from '../../views-components/snackbar/snackbar';
 
 const drawerWidth = 240;
 const appBarHeight = 100;
@@ -79,6 +82,7 @@ interface WorkbenchDataProps {
     projects: Array<TreeItem<ProjectResource>>;
     currentProjectId: string;
     user?: User;
+    currentToken?: string;
     sidePanelItems: SidePanelItem[];
 }
 
@@ -96,6 +100,7 @@ interface NavMenuItem extends MainAppBarMenuItem {
 }
 
 interface WorkbenchState {
+    isCurrentTokenDialogOpen: boolean;
     anchorEl: any;
     searchText: string;
     menuItems: {
@@ -111,17 +116,23 @@ export const Workbench = withStyles(styles)(
             projects: state.projects.items,
             currentProjectId: state.projects.currentItemId,
             user: state.auth.user,
+            currentToken: state.auth.apiToken,
             sidePanelItems: state.sidePanel
         })
     )(
         class extends React.Component<WorkbenchProps, WorkbenchState> {
             state = {
                 isCreationDialogOpen: false,
+                isCurrentTokenDialogOpen: false,
                 anchorEl: null,
                 searchText: "",
                 breadcrumbs: [],
                 menuItems: {
                     accountMenu: [
+                        {
+                            label: 'Current token',
+                            action: () => this.toggleCurrentTokenModal()
+                        },
                         {
                             label: "Logout",
                             action: () => this.props.dispatch(authActions.LOGOUT())
@@ -179,7 +190,7 @@ export const Workbench = withStyles(styles)(
                                     onContextMenu={(event) => this.openContextMenu(event, {
                                         uuid: authService.getUuid() || "",
                                         name: "",
-                                        kind: ContextMenuKind.RootProject
+                                        kind: ContextMenuKind.ROOT_PROJECT
                                     })}>
                                     <ProjectTree
                                         projects={this.props.projects}
@@ -187,12 +198,12 @@ export const Workbench = withStyles(styles)(
                                         onContextMenu={(event, item) => this.openContextMenu(event, {
                                             uuid: item.data.uuid,
                                             name: item.data.name,
-                                            kind: ContextMenuKind.Project
+                                            kind: ContextMenuKind.PROJECT
                                         })}
                                         toggleActive={itemId => {
                                             this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE));
-                                            this.props.dispatch<any>(loadDetails(itemId, ResourceKind.Project));
-                                            this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.Projects));
+                                            this.props.dispatch<any>(loadDetails(itemId, ResourceKind.PROJECT));
+                                            this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS));
                                         }} />
                                 </SidePanel>
                             </Drawer>}
@@ -206,7 +217,12 @@ export const Workbench = withStyles(styles)(
                             {user && <DetailsPanel />}
                         </main>
                         <ContextMenu />
+                        <Snackbar />
                         <CreateProjectDialog />
+                        <CurrentTokenDialog
+                            currentToken={this.props.currentToken}
+                            open={this.state.isCurrentTokenDialogOpen}
+                            handleClose={this.toggleCurrentTokenModal} />
                     </div>
                 );
             }
@@ -214,7 +230,7 @@ export const Workbench = withStyles(styles)(
             renderProjectPanel = (props: RouteComponentProps<{ id: string }>) => <ProjectPanel
                 onItemRouteChange={itemId => this.props.dispatch<any>(setProjectItem(itemId, ItemMode.ACTIVE))}
                 onContextMenu={(event, item) => {
-                    const kind = item.kind === ResourceKind.Project ? ContextMenuKind.Project : ContextMenuKind.Resource;
+                    const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE;
                     this.openContextMenu(event, {
                         uuid: item.uuid,
                         name: item.name,
@@ -227,17 +243,18 @@ export const Workbench = withStyles(styles)(
                 }}
                 onItemDoubleClick={item => {
                     this.props.dispatch<any>(setProjectItem(item.uuid, ItemMode.ACTIVE));
-                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.Project));
+                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.PROJECT));
                 }}
                 {...props} />
 
             renderFavoritePanel = (props: RouteComponentProps<{ id: string }>) => <FavoritePanel
-                onItemRouteChange={itemId => this.props.dispatch<any>(setFavoriteItem(itemId, ItemMode.ACTIVE))}
+                onItemRouteChange={() => this.props.dispatch<any>(dataExplorerActions.REQUEST_ITEMS({ id: FAVORITE_PANEL_ID }))}
                 onContextMenu={(event, item) => {
+                    const kind = item.kind === ResourceKind.PROJECT ? ContextMenuKind.PROJECT : ContextMenuKind.RESOURCE;
                     this.openContextMenu(event, {
                         uuid: item.uuid,
                         name: item.name,
-                        kind: ContextMenuKind.Favorite,
+                        kind,
                     });
                 }}
                 onDialogOpen={this.handleCreationDialogOpen}
@@ -245,15 +262,16 @@ export const Workbench = withStyles(styles)(
                     this.props.dispatch<any>(loadDetails(item.uuid, item.kind as ResourceKind));
                 }}
                 onItemDoubleClick={item => {
-                    this.props.dispatch<any>(setFavoriteItem(item.uuid, ItemMode.ACTIVE));
-                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.Project));
+                    this.props.dispatch<any>(loadDetails(item.uuid, ResourceKind.PROJECT));
+                    this.props.dispatch<any>(setProjectItem(item.uuid, ItemMode.ACTIVE));
+                    this.props.dispatch<any>(sidePanelActions.TOGGLE_SIDE_PANEL_ITEM_ACTIVE(SidePanelIdentifiers.PROJECTS));
                 }}
                 {...props} />
 
             mainAppBarActions: MainAppBarActionProps = {
                 onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => {
                     this.props.dispatch<any>(setProjectItem(itemId, ItemMode.BOTH));
-                    this.props.dispatch<any>(loadDetails(itemId, ResourceKind.Project));
+                    this.props.dispatch<any>(loadDetails(itemId, ResourceKind.PROJECT));
                 },
                 onSearch: searchText => {
                     this.setState({ searchText });
@@ -267,7 +285,7 @@ export const Workbench = withStyles(styles)(
                     this.openContextMenu(event, {
                         uuid: breadcrumb.itemId,
                         name: breadcrumb.label,
-                        kind: ContextMenuKind.Project
+                        kind: ContextMenuKind.PROJECT
                     });
                 }
             };
@@ -298,6 +316,10 @@ export const Workbench = withStyles(styles)(
                     })
                 );
             }
+
+            toggleCurrentTokenModal = () => {
+                this.setState({ isCurrentTokenDialogOpen: !this.state.isCurrentTokenDialogOpen });
+            }
         }
     )
 );