[ARVADOS-WORKBENCH2] updated: 1.1.4-117-ge5b901f
Git user
git at public.curoverse.com
Wed Jun 20 02:09:09 EDT 2018
Summary of changes:
.../column-selector/column-selector.test.tsx | 4 +-
.../column-selector/column-selector.tsx | 4 +-
src/components/data-table/data-table.tsx | 6 ++-
src/components/data-table/index.ts | 9 ----
.../dropdown-menu/dropdown-menu.test.tsx | 0
.../dropdown-menu/dropdown-menu.tsx | 0
.../search-bar/search-bar.test.tsx | 0
.../{main-app-bar => }/search-bar/search-bar.tsx | 0
src/index.tsx | 8 ++--
.../index.ts => models/collection.ts} | 6 ++-
src/models/project.ts | 11 ++---
src/models/{project.ts => resource.ts} | 6 +--
src/services/auth-service/auth-service.ts | 15 +++---
.../collection-service/collection-service.ts | 53 ++++++++++++++++++++++
src/services/project-service/project-service.ts | 41 ++++++-----------
src/services/response.ts | 11 +++++
src/services/services.ts | 2 +
src/store/auth/auth-action.ts | 15 +++++-
src/store/auth/auth-reducer.test.ts | 11 ++---
src/store/auth/auth-reducer.ts | 10 +---
src/store/collection/collection-action.ts | 29 ++++++++++++
src/store/collection/collection-reducer.test.ts | 41 +++++++++++++++++
src/store/collection/collection-reducer.ts | 25 ++++++++++
src/store/project/project-action.ts | 10 ++++
src/store/store.ts | 2 +
.../api-token/api-token.tsx | 9 ++--
.../data-explorer/data-explorer.tsx | 11 +++--
.../data-explorer/data-item.ts | 3 +-
.../main-app-bar/main-app-bar.test.tsx | 8 ++--
.../main-app-bar/main-app-bar.tsx | 8 ++--
.../project-list/project-list.tsx | 0
.../project-tree/project-tree.test.tsx | 2 +-
.../project-tree/project-tree.tsx | 2 +-
src/views/data-explorer/data-explorer-selectors.ts | 11 +++++
src/views/data-explorer/data-explorer.tsx | 33 ++++----------
src/views/workbench/workbench.tsx | 10 ++--
36 files changed, 284 insertions(+), 132 deletions(-)
rename src/components/{data-table => }/column-selector/column-selector.test.tsx (97%)
rename src/components/{data-table => }/column-selector/column-selector.tsx (94%)
delete mode 100644 src/components/data-table/index.ts
rename src/components/{main-app-bar => }/dropdown-menu/dropdown-menu.test.tsx (100%)
rename src/components/{main-app-bar => }/dropdown-menu/dropdown-menu.tsx (100%)
rename src/components/{main-app-bar => }/search-bar/search-bar.test.tsx (100%)
rename src/components/{main-app-bar => }/search-bar/search-bar.tsx (100%)
rename src/{components/data-explorer/index.ts => models/collection.ts} (52%)
copy src/models/{project.ts => resource.ts} (53%)
create mode 100644 src/services/collection-service/collection-service.ts
create mode 100644 src/services/response.ts
create mode 100644 src/store/collection/collection-action.ts
create mode 100644 src/store/collection/collection-reducer.test.ts
create mode 100644 src/store/collection/collection-reducer.ts
rename src/{components => views-components}/api-token/api-token.tsx (77%)
rename src/{components => views-components}/data-explorer/data-explorer.tsx (93%)
rename src/{components => views-components}/data-explorer/data-item.ts (92%)
rename src/{components => views-components}/main-app-bar/main-app-bar.test.tsx (95%)
rename src/{components => views-components}/main-app-bar/main-app-bar.tsx (94%)
rename src/{components => views-components}/project-list/project-list.tsx (100%)
rename src/{components => views-components}/project-tree/project-tree.test.tsx (98%)
rename src/{components => views-components}/project-tree/project-tree.tsx (96%)
create mode 100644 src/views/data-explorer/data-explorer-selectors.ts
via e5b901f7d6f87b56f43d3dbe002c9c90a3d41349 (commit)
via 4a5d370214feccdab2a9d3cf398471daa695d401 (commit)
via 09c61f87d52388ebfe97f478d536f4f194755401 (commit)
via 7966796b929e29fd647ed9d7839406d30921c52b (commit)
via df778b7e960b73a4f765c13d0e7ccc4525a27b56 (commit)
via 9e4b7889a99ff2f76d8029aef3a85c4620178ba3 (commit)
from 8dc6f80d8dc2365248093ae7c402491d4614d7f4 (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 e5b901f7d6f87b56f43d3dbe002c9c90a3d41349
Merge: 8dc6f80 4a5d370
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date: Wed Jun 20 08:09:00 2018 +0200
refs #13632 Merge branch '13632-collections-service'
# Conflicts:
# src/components/data-table/data-table.tsx
# src/views-components/data-explorer/data-explorer.tsx
# src/views/data-explorer/data-explorer.tsx
Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>
diff --cc src/components/data-table/data-table.tsx
index ec260e9,bc5df0d..37e0fe1
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@@ -6,11 -6,12 +6,13 @@@ import * as React from 'react'
import { Table, TableBody, TableRow, TableCell, TableHead, StyleRulesCallback, Theme, WithStyles, withStyles, Typography } from '@material-ui/core';
import { DataColumn } from './data-column';
+ export type DataColumns<T> = Array<DataColumn<T>>;
+
export interface DataTableProps<T> {
items: T[];
- columns: Array<DataColumn<T>>;
+ columns: DataColumns<T>;
- onItemClick?: (item: T) => void;
+ onRowClick?: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
+ onRowContextMenu?: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
}
class DataTable<T> extends React.Component<DataTableProps<T> & WithStyles<CssRules>> {
diff --cc src/views-components/data-explorer/data-explorer.tsx
index 874c325,1215915..c4de01a
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@@ -3,24 -3,17 +3,27 @@@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
- import { DataTable, DataColumn, ColumnSelector } from "../../components/data-table";
-import { Typography, Grid, ListItem, Divider, List, ListItemIcon, ListItemText, Paper, Toolbar } from '@material-ui/core';
-import IconButton, { IconButtonProps } from '@material-ui/core/IconButton';
+import { Typography, Grid, Paper, Toolbar } from '@material-ui/core';
+import IconButton from '@material-ui/core/IconButton';
import MoreVertIcon from "@material-ui/icons/MoreVert";
-import Popover from '../../components/popover/popover';
import { formatFileSize, formatDate } from '../../common/formatters';
import { DataItem } from './data-item';
- import { mockAnchorFromMouseEvent } from '../popover/helpers';
- import ContextMenu from '../context-menu/context-menu';
-import { DataColumns, DataTableProps } from "../../components/data-table/data-table";
-import { DataColumn } from "../../components/data-table/data-column";
++import { DataColumns } from "../../components/data-table/data-table";
++import ContextMenu from "../../components/context-menu/context-menu";
+ import ColumnSelector from "../../components/column-selector/column-selector";
+ import DataTable from "../../components/data-table/data-table";
++import { mockAnchorFromMouseEvent } from "../../components/popover/helpers";
++import { DataColumn } from "../../components/data-table/data-column";
+export interface DataExplorerContextActions {
+ onAddToFavourite: (dataIitem: DataItem) => void;
+ onCopy: (dataIitem: DataItem) => void;
+ onDownload: (dataIitem: DataItem) => void;
+ onMoveTo: (dataIitem: DataItem) => void;
+ onRemove: (dataIitem: DataItem) => void;
+ onRename: (dataIitem: DataItem) => void;
+ onShare: (dataIitem: DataItem) => void;
+}
interface DataExplorerProps {
items: DataItem[];
onItemClick: (item: DataItem) => void;
@@@ -28,11 -20,7 +31,11 @@@
}
interface DataExplorerState {
- columns: Array<DataColumn<DataItem>>;
+ columns: DataColumns<DataItem>;
+ contextMenu: {
+ anchorEl?: HTMLElement;
+ item?: DataItem;
+ };
}
class DataExplorer extends React.Component<DataExplorerProps, DataExplorerState> {
diff --cc src/views/data-explorer/data-explorer.tsx
index da09b69,baeb946..f4ee36f
--- a/src/views/data-explorer/data-explorer.tsx
+++ b/src/views/data-explorer/data-explorer.tsx
@@@ -11,9 -10,10 +10,10 @@@ import { RootState } from '../../store/
import { connect, DispatchProp } from 'react-redux';
import { push } from 'react-router-redux';
import projectActions from "../../store/project/project-action";
- import { DataExplorer, DataItem } from '../../components/data-explorer';
- import { TreeItem } from '../../components/tree/tree';
- import { DataExplorerContextActions } from '../../components/data-explorer/data-explorer';
+ import { DataColumns } from "../../components/data-table/data-table";
-import { DataItem } from "../../views-components/data-explorer/data-item";
-import DataExplorer from "../../views-components/data-explorer/data-explorer";
++import DataExplorer, { DataExplorerContextActions } from "../../views-components/data-explorer/data-explorer";
+ import { mapProjectTreeItem } from "./data-explorer-selectors";
++import { DataItem } from "../../views-components/data-explorer/data-item";
interface DataExplorerViewDataProps {
projects: ProjectState;
@@@ -34,39 -29,18 +29,29 @@@ class DataExplorerView extends React.Co
const projectItems = project && project.items || [];
return (
<DataExplorer
- items={projectItems.map(mapTreeItem)}
+ items={projectItems.map(mapProjectTreeItem)}
onItemClick={this.goToProject}
+ contextActions={this.contextActions}
/>
);
}
+ contextActions: DataExplorerContextActions = {
+ onAddToFavourite: console.log,
+ onCopy: console.log,
+ onDownload: console.log,
+ onMoveTo: console.log,
+ onRemove: console.log,
+ onRename: console.log,
+ onShare: console.log
+ };
+
- goToProject = (project: MappedProjectItem) => {
- this.props.dispatch(push(`/project/${project.uuid}`));
- this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(project.uuid));
+ goToProject = (item: DataItem) => {
- this.props.dispatch(push(`/project/${item.uuid}`));
++ this.props.dispatch(push(`/project/${item}`));
+ this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(item.uuid));
}
-
}
- const mapTreeItem = (item: TreeItem<Project>): MappedProjectItem => ({
- name: item.data.name,
- type: item.data.kind,
- owner: item.data.ownerUuid,
- lastModified: item.data.modifiedAt,
- uuid: item.data.uuid
- });
-
-
export default connect(
(state: RootState) => ({
projects: state.projects
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list