[ARVADOS-WORKBENCH2] updated: 1.1.4-228-gef5638d
Git user
git at public.curoverse.com
Mon Jul 9 04:34:56 EDT 2018
Summary of changes:
.gitignore | 7 +
src/common/api/common-resource-service.test.ts | 2 +-
src/common/api/common-resource-service.ts | 16 ++-
src/common/api/filter-builder.test.ts | 86 +++++++++++
src/common/api/filter-builder.ts | 64 ++++++---
src/common/api/order-builder.test.ts | 23 ++-
src/common/api/order-builder.ts | 40 ++++--
src/common/custom-theme.ts | 62 ++++++++
src/components/attribute/attribute.tsx | 46 ++++++
.../data-explorer/data-explorer.test.tsx | 15 +-
src/components/data-explorer/data-explorer.tsx | 13 +-
src/components/data-table/data-column.ts | 18 ++-
src/components/data-table/data-table.test.tsx | 65 +++++----
src/components/data-table/data-table.tsx | 16 ++-
src/components/side-panel/side-panel.tsx | 2 +-
src/index.tsx | 20 +--
src/models/collection.ts | 21 ++-
src/models/container-request.ts | 40 ++++++
src/models/group.ts | 18 +++
src/models/kinds.ts | 12 ++
src/models/process.ts | 7 +
src/models/project.ts | 9 +-
src/models/workflow.ts | 13 ++
.../collection-service/collection-service.ts | 6 +-
src/services/groups-service/groups-service.test.ts | 2 +-
src/services/groups-service/groups-service.ts | 32 +++--
src/services/project-service/project-service.ts | 51 -------
src/services/services.ts | 2 -
src/store/data-explorer/data-explorer-action.ts | 20 +--
src/store/data-explorer/data-explorer-reducer.ts | 12 +-
src/store/navigation/navigation-action.ts | 14 +-
.../project-panel/project-panel-middleware.ts | 128 +++++++++++++++++
src/store/project/project-action.ts | 15 +-
src/store/project/project-reducer.test.ts | 5 +-
src/store/store.ts | 4 +-
.../data-explorer/data-explorer.tsx | 52 ++++++-
.../details-panel/details-panel.tsx | 119 +++++++++++++++
.../main-app-bar/main-app-bar.test.tsx | 5 +
src/views-components/main-app-bar/main-app-bar.tsx | 41 +++---
src/views/project-panel/project-panel-item.ts | 20 +--
src/views/project-panel/project-panel-selectors.ts | 49 -------
src/views/project-panel/project-panel.tsx | 160 +++++++++++++--------
src/views/workbench/workbench.tsx | 23 ++-
43 files changed, 1014 insertions(+), 361 deletions(-)
create mode 100644 src/common/api/filter-builder.test.ts
create mode 100644 src/common/custom-theme.ts
create mode 100644 src/components/attribute/attribute.tsx
create mode 100644 src/models/container-request.ts
create mode 100644 src/models/group.ts
create mode 100644 src/models/kinds.ts
create mode 100644 src/models/process.ts
create mode 100644 src/models/workflow.ts
delete mode 100644 src/services/project-service/project-service.ts
create mode 100644 src/store/project-panel/project-panel-middleware.ts
create mode 100644 src/views-components/details-panel/details-panel.tsx
delete mode 100644 src/views/project-panel/project-panel-selectors.ts
via ef5638d48d3df04d37c80baace632e743d3e5102 (commit)
via f14b66751cfaf92a2bc28331d8878789d4040e8f (commit)
via 4a8d85d10073d2555253bdb631d293eaf7deccbf (commit)
via f362812f74c69b62e107b094f2508ae7fb8cbbff (commit)
via a11dcd54b81bc5a81aaf3297df3164df4f725e1b (commit)
via 22767c36fbba414fada1643345dbf2a61baf80ac (commit)
via e0cb98c44ed8f32f269d2b9f878184263cd14192 (commit)
via ad2c0bec0c54962c028b5b2db7a1c6be3d9d12c8 (commit)
via 9dcc70fc137fac02991f3ebe830748badb4eab35 (commit)
via 5844264e8def16755e8da6e7e57a716e69a130ff (commit)
via b22b921c05816744f83e2a726d93705b3b8f0599 (commit)
via 79ea5270b83bbfef8e7da569a60fcda5ecf34b75 (commit)
via 9820e0e8fc2e92de5c6b97a7b43a9ca54e5a2dd6 (commit)
via 9ab26fe1f0838a97818416bd6b833fc74968ed65 (commit)
via 5c513f2c78337482da4cc6055706fd022c26c007 (commit)
via e9b57c9d6025168cc29442c85fd784902007052a (commit)
via 6d107715ed9b4ef029ba5cdf6d3839883c8333c2 (commit)
via ca88aa7165ef8320a0f2cc0125ec647eb31aab15 (commit)
via 3e1104db668dcbfffe2e1b0165691b1d9ea306f3 (commit)
via e7c978d1f6fa309e8462fc952f2735c39a4040bb (commit)
via c75bda19a301c0a197dda696208ea10b6459c54a (commit)
via 9df4e3529aee3343eba37ef5bfc004315ef28a59 (commit)
via c497eae178ec7398381092817b69662af5701796 (commit)
via ef305b983cd28c2f3535cb6b3eb46e9a02e1a409 (commit)
via c178bb7bacbb174f6b645e410323dbecd59e1a2c (commit)
via 9fbe0f44685e9c3c00f753bd36e858bd23c46680 (commit)
via c282281e22bd7a52dae2c72282a956f7a4ecae04 (commit)
via 4dc31d8b4c4e4947fea1f7a69eb8eb06a3324dd0 (commit)
via 3db295e22bbe57635eac43b21530a61c29de293a (commit)
via 508746f3c7c6d7077f4290228c393e0e29d58573 (commit)
via ceba702623665c3948fe5372ecf57ba61dae4892 (commit)
via bcca5d91296f24e10fdf842cda26a32f6f910ef4 (commit)
via 5678598e1b83b59c14a7ace3ee9ae39368be3c28 (commit)
via b0573b45f19c656ac07901004a3686ef10d402a5 (commit)
via a918d09702ac7b1ac111ea12ded1cdb2bd801e88 (commit)
via 2f92d8c274f35c96345d57716363a311bd289ba4 (commit)
via 3816facfe98d5ee9c0b825880188214e336b0506 (commit)
via 2767521c504e5a43cfdcf86781f94ce2bcfc81e4 (commit)
via 3f60fa9f43e8f5bd9891b1687830ec7ef120236e (commit)
via 4433dd83d5967d35cde06f4ed5185c2b20ec0c0b (commit)
via 137f7f8bbfb118af318cea460df8bd6e717fcf82 (commit)
via 69a166d7f4e7768cfa79c133b45b3e6f7601e9b7 (commit)
via 7cc553052bd1abb3de3916f0c371224699fc6264 (commit)
via 32a3dc29d8cb3f1d7229f8801f173f233a3fdcef (commit)
via bb6014754664dd6365a2b6592e97e23fc36b1f21 (commit)
via 3127f7c6b7c0a68981598ffb83efa7ae0b41ae7c (commit)
via 2daa121d2affffc715d28653ce9802e7f1ee7644 (commit)
via e68620ddab69983f6bf127d51017bed2f21e0d4a (commit)
from d116e491ef904d97dcece5ab1632bef08906ec87 (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 ef5638d48d3df04d37c80baace632e743d3e5102
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Sun Jul 8 13:57:04 2018 +0200
changing location of context-menu
Feature #13694
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx
index 09a3272..ce285fa 100644
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -30,6 +30,8 @@ interface DataExplorerProps<T> {
onFiltersChange: (filters: DataTableFilterItem[], column: DataColumn<T>) => void;
onChangePage: (page: number) => void;
onChangeRowsPerPage: (rowsPerPage: number) => void;
+ openContextMenu: (event: React.MouseEvent<HTMLElement>, item: T) => void;
+ closeContextMenu: () => void;
}
interface DataExplorerState<T> {
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 099263d..cb24788 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -17,6 +17,7 @@ import { DataTableFilterItem } from '../../components/data-table-filters/data-ta
import { ContainerRequestState } from '../../models/container-request';
import { SortDirection } from '../../components/data-table/data-column';
import DialogProjectCreate from '../../components/dialog-create/dialog-project-create';
+import { mockAnchorFromMouseEvent } from "../../components/popover/helpers";
export const PROJECT_PANEL_ID = "projectPanel";
@@ -24,6 +25,14 @@ export interface ProjectPanelFilter extends DataTableFilterItem {
type: ResourceKind | ContainerRequestState;
}
+interface DataExplorerState<T> {
+ contextMenu: {
+ anchorEl?: HTMLElement;
+ item?: T;
+ };
+ open?: boolean;
+}
+
type ProjectPanelProps = {
currentItemId: string,
onItemClick: (item: ProjectPanelItem) => void,
@@ -35,11 +44,13 @@ type ProjectPanelProps = {
& DispatchProp
& WithStyles<CssRules>
& RouteComponentProps<{ id: string }>;
-class ProjectPanel extends React.Component<ProjectPanelProps> {
- state = {
+
+class ProjectPanel extends React.Component<ProjectPanelProps, DataExplorerState<any>> {
+ state: DataExplorerState<any> = {
+ contextMenu: {},
open: false,
};
-
+
render() {
return <div>
<div className={this.props.classes.toolbar}>
@@ -58,7 +69,9 @@ class ProjectPanel extends React.Component<ProjectPanelProps> {
id={PROJECT_PANEL_ID}
contextActions={contextMenuActions}
onRowClick={this.props.onItemClick}
- onContextAction={this.executeAction} />;
+ onContextAction={this.executeAction}
+ openContextMenu={this.openContextMenu}
+ closeContextMenu={this.closeContextMenu} />;
</div>;
}
@@ -72,6 +85,21 @@ class ProjectPanel extends React.Component<ProjectPanelProps> {
alert(`Executing ${action.name} on ${item.name}`);
}
+ openContextMenu = (event: React.MouseEvent<HTMLElement>, item: any) => {
+ event.preventDefault();
+ event.stopPropagation();
+ this.setState({
+ contextMenu: {
+ anchorEl: mockAnchorFromMouseEvent(event),
+ item
+ }
+ });
+ }
+
+ closeContextMenu = () => {
+ this.setState({ contextMenu: {} });
+ }
+
}
type CssRules = "toolbar" | "button";
@@ -228,6 +256,9 @@ export const columns: DataColumns<ProjectPanelItem, ProjectPanelFilter> = [{
}];
const contextMenuActions = [[{
+ icon: "fas fa-plus fa-fw",
+ name: "New project"
+}, {
icon: "fas fa-users fa-fw",
name: "Share"
}, {
commit f14b66751cfaf92a2bc28331d8878789d4040e8f
Merge: 9dcc70f 4a8d85d
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Fri Jul 6 23:11:20 2018 +0200
merge-commit
Feature #13694
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/views/project-panel/project-panel.tsx
index 3d7d894,c1d6660..099263d
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@@ -7,16 -7,15 +7,16 @@@ import { ProjectPanelItem } from './pro
import { Grid, Typography, Button, Toolbar, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
import { formatDate, formatFileSize } from '../../common/formatters';
import DataExplorer from "../../views-components/data-explorer/data-explorer";
- import { DataColumn, toggleSortDirection } from '../../components/data-table/data-column';
- import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
import { ContextMenuAction } from '../../components/context-menu/context-menu';
import { DispatchProp, connect } from 'react-redux';
- import actions from "../../store/data-explorer/data-explorer-action";
import { DataColumns } from '../../components/data-table/data-table';
- import { ResourceKind } from "../../models/resource";
import { RouteComponentProps } from 'react-router';
import { RootState } from '../../store/store';
+ import { ResourceKind } from '../../models/kinds';
+ import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
+ import { ContainerRequestState } from '../../models/container-request';
+ import { SortDirection } from '../../components/data-table/data-column';
+import DialogProjectCreate from '../../components/dialog-create/dialog-project-create';
export const PROJECT_PANEL_ID = "projectPanel";
@@@ -45,10 -41,9 +49,10 @@@ class ProjectPanel extends React.Compon
<Button color="primary" variant="raised" className={this.props.classes.button}>
Run a process
</Button>
- <Button color="primary" variant="raised" className={this.props.classes.button}>
- Create a project
+ <Button color="primary" onClick={this.props.handleCreationDialogOpen} variant="raised" className={this.props.classes.button}>
- Create a project
++ New project
</Button>
+ <DialogProjectCreate open={this.props.isCreationDialogOpen} handleClose={this.props.handleCreationDialogClose}/>
</div>
<DataExplorer
id={PROJECT_PANEL_ID}
commit 9dcc70fc137fac02991f3ebe830748badb4eab35
Merge: d116e49 2f92d8c
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Fri Jul 6 10:09:10 2018 +0200
Merge remote-tracking branch 'origin' into 13694-Data-operations-Project-creation
refs #13694
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list