[ARVADOS-WORKBENCH2] updated: 1.2.0-138-gc3bec33
Git user
git at public.curoverse.com
Mon Aug 27 06:05:08 EDT 2018
Summary of changes:
src/routes/routes.ts | 2 +-
src/views-components/main-app-bar/main-app-bar.tsx | 2 --
src/views/workbench/workbench.tsx | 19 +------------------
3 files changed, 2 insertions(+), 21 deletions(-)
via c3bec339e0f247f7cbc8698120b8ecf43629d3e7 (commit)
from 0c46a74e6c0397fa153c345857977f8654ec4471 (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 c3bec339e0f247f7cbc8698120b8ecf43629d3e7
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Aug 27 12:04:49 2018 +0200
Clean up code
Feature #14102
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/routes/routes.ts b/src/routes/routes.ts
index 7ad7389..cacdd4b 100644
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@ -54,7 +54,7 @@ export interface CollectionRouteParams {
}
export const matchCollectionRoute = (route: string) =>
- matchPath<ProjectRouteParams>(route, { path: Routes.COLLECTIONS });
+ matchPath<CollectionRouteParams>(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 4c16754..73a8608 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<HTMLElement>, breadcrumb: Breadcrumb) => void;
onDetailsPanelToggle: () => void;
}
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index a3ee07e..00d6c7c 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<any> & WithStyles<CssRules>;
-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<HTMLElement>, breadcrumb: NavBreadcrumb) => {
- this.props.dispatch<any>(openContextMenu(event, {
- uuid: breadcrumb.itemId,
- name: breadcrumb.label,
- kind: ContextMenuKind.PROJECT
- }));
- }
};
toggleCurrentTokenModal = () => {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list