From c3bec339e0f247f7cbc8698120b8ecf43629d3e7 Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Mon, 27 Aug 2018 12:04:49 +0200 Subject: [PATCH] Clean up code Feature #14102 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/routes/routes.ts | 2 +- .../main-app-bar/main-app-bar.tsx | 2 -- src/views/workbench/workbench.tsx | 19 +------------------ 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/routes/routes.ts b/src/routes/routes.ts index 7ad73899..cacdd4b3 100644 --- a/src/routes/routes.ts +++ b/src/routes/routes.ts @@ -54,7 +54,7 @@ export interface CollectionRouteParams { } export const matchCollectionRoute = (route: string) => - matchPath(route, { path: Routes.COLLECTIONS }); + matchPath(route, { path: Routes.COLLECTIONS }); const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => { diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx index 4c16754c..73a8608c 100644 --- a/src/views-components/main-app-bar/main-app-bar.tsx +++ b/src/views-components/main-app-bar/main-app-bar.tsx @@ -31,9 +31,7 @@ interface MainAppBarDataProps { export interface MainAppBarActionProps { onSearch: (searchText: string) => void; - onBreadcrumbClick: (breadcrumb: Breadcrumb) => void; onMenuItemClick: (menuItem: MainAppBarMenuItem) => void; - onContextMenu: (event: React.MouseEvent, breadcrumb: Breadcrumb) => void; onDetailsPanelToggle: () => void; } diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index a3ee07ee..00d6c7ce 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -10,7 +10,6 @@ import { login, logout } from "~/store/auth/auth-action"; import { User } from "~/models/user"; import { RootState } from "~/store/store"; import { MainAppBar, MainAppBarActionProps, MainAppBarMenuItem } from '~/views-components/main-app-bar/main-app-bar'; -import { Breadcrumb } from '~/components/breadcrumbs/breadcrumbs'; import { push } from 'react-router-redux'; import { TreeItem } from "~/components/tree/tree"; import { ProjectPanel } from "~/views/project-panel/project-panel"; @@ -18,9 +17,8 @@ import { DetailsPanel } from '~/views-components/details-panel/details-panel'; import { ArvadosTheme } from '~/common/custom-theme'; import { CreateProjectDialog } from "~/views-components/create-project-dialog/create-project-dialog"; import { detailsPanelActions } from "~/store/details-panel/details-panel-action"; -import { openContextMenu } from '~/store/context-menu/context-menu-actions'; import { ProjectResource } from '~/models/project'; -import { ContextMenu, ContextMenuKind } from "~/views-components/context-menu/context-menu"; +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 { Snackbar } from '~/views-components/snackbar/snackbar'; @@ -40,7 +38,6 @@ import { MoveProjectDialog } from '~/views-components/move-project-dialog/move-p import { MoveCollectionDialog } from '~/views-components/move-collection-dialog/move-collection-dialog'; import { SidePanel } from '~/views-components/side-panel/side-panel'; import { Routes } from '~/routes/routes'; -import { navigateTo } from '~/store/navigation/navigation-action'; import { Breadcrumbs } from '~/views-components/breadcrumbs/breadcrumbs'; @@ -95,10 +92,6 @@ interface WorkbenchActionProps { type WorkbenchProps = WorkbenchDataProps & WorkbenchGeneralProps & WorkbenchActionProps & DispatchProp & WithStyles; -interface NavBreadcrumb extends Breadcrumb { - itemId: string; -} - interface NavMenuItem extends MainAppBarMenuItem { action: () => void; } @@ -207,9 +200,6 @@ export const Workbench = withStyles(styles)( } mainAppBarActions: MainAppBarActionProps = { - onBreadcrumbClick: ({ itemId }: NavBreadcrumb) => { - this.props.dispatch(navigateTo(itemId)); - }, onSearch: searchText => { this.setState({ searchText }); this.props.dispatch(push(`/search?q=${searchText}`)); @@ -218,13 +208,6 @@ export const Workbench = withStyles(styles)( onDetailsPanelToggle: () => { this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL()); }, - onContextMenu: (event: React.MouseEvent, breadcrumb: NavBreadcrumb) => { - this.props.dispatch(openContextMenu(event, { - uuid: breadcrumb.itemId, - name: breadcrumb.label, - kind: ContextMenuKind.PROJECT - })); - } }; toggleCurrentTokenModal = () => { -- 2.30.2