[ARVADOS-WORKBENCH2] updated: 1.1.4-540-g232eac9
Git user
git at public.curoverse.com
Tue Aug 7 05:34:06 EDT 2018
Summary of changes:
package.json | 24 ++--
.../collection-panel-files.tsx | 68 +++++++++++
.../file-tree/file-tree-data.ts} | 5 +-
src/components/file-tree/file-tree-item.tsx | 73 +++++++++++
src/components/file-tree/file-tree.tsx | 51 ++++++++
src/components/icon/icon.tsx | 4 +-
.../list-item-text-icon/list-item-text-icon.tsx | 2 +-
src/components/side-panel/side-panel.tsx | 2 +-
src/components/tree/tree.test.tsx | 48 ++++++++
src/components/tree/tree.tsx | 62 ++++++++--
src/index.tsx | 4 +
src/models/collection-file.ts | 44 +++++++
src/models/keep-manifest.ts | 17 +++
src/models/object-types.ts | 23 ++++
src/models/tree.test.ts | 88 +++++++++++++
src/models/tree.ts | 107 ++++++++++++++++
.../collection-files-service.ts | 25 ++++
.../collection-manifest-mapper.test.ts | 59 +++++++++
.../collection-manifest-mapper.ts | 73 +++++++++++
.../collection-manifest-parser.test.ts | 34 ++++++
.../collection-manifest-parser.ts | 46 +++++++
src/services/services.ts | 12 +-
.../collection-panel/collection-panel-action.ts | 9 +-
.../collection-panel-files-actions.ts | 16 +++
.../collection-panel-files-reducer.test.ts | 116 ++++++++++++++++++
.../collection-panel-files-reducer.ts | 74 +++++++++++
.../collection-panel-files-state.ts | 26 ++++
src/store/details-panel/details-panel-action.ts | 10 +-
src/store/dialog/dialog-actions.ts | 15 +++
src/store/dialog/dialog-reducer.test.ts | 30 +++++
src/store/dialog/dialog-reducer.ts | 22 ++++
src/store/dialog/with-dialog.ts | 33 +++++
src/store/navigation/navigation-action.ts | 36 +++++-
src/store/store.ts | 33 +++--
.../create-collection-validator.tsx} | 4 +-
.../create-project/create-project-validator.tsx | 2 -
.../collection-panel-files.ts | 86 +++++++++++++
.../action-sets/collection-files-action-set.ts | 35 ++++++
.../collection-files-item-action-set.ts | 29 +++++
.../context-menu/actions/favorite-action.tsx | 2 +-
src/views-components/context-menu/context-menu.tsx | 2 +
.../create-project-dialog.tsx | 2 +-
.../data-explorer/data-explorer.tsx | 56 +++++----
.../dialog-create/dialog-collection-create.tsx | 2 +-
.../dialog-update/dialog-collection-update.tsx | 2 +-
.../remove-dialog/remove-dialog.tsx | 34 ++++++
.../rename-dialog/rename-dialog.tsx | 37 ++++++
src/views/collection-panel/collection-panel.tsx | 31 ++---
src/views/project-panel/project-panel.tsx | 8 ++
src/views/workbench/workbench.tsx | 5 +-
yarn.lock | 136 ++++++++++-----------
51 files changed, 1586 insertions(+), 178 deletions(-)
create mode 100644 src/components/collection-panel-files/collection-panel-files.tsx
copy src/{models/empty.ts => components/file-tree/file-tree-data.ts} (63%)
create mode 100644 src/components/file-tree/file-tree-item.tsx
create mode 100644 src/components/file-tree/file-tree.tsx
create mode 100644 src/models/collection-file.ts
create mode 100644 src/models/keep-manifest.ts
create mode 100644 src/models/object-types.ts
create mode 100644 src/models/tree.test.ts
create mode 100644 src/models/tree.ts
create mode 100644 src/services/collection-files-service/collection-files-service.ts
create mode 100644 src/services/collection-files-service/collection-manifest-mapper.test.ts
create mode 100644 src/services/collection-files-service/collection-manifest-mapper.ts
create mode 100644 src/services/collection-files-service/collection-manifest-parser.test.ts
create mode 100644 src/services/collection-files-service/collection-manifest-parser.ts
create mode 100644 src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
create mode 100644 src/store/collection-panel/collection-panel-files/collection-panel-files-reducer.test.ts
create mode 100644 src/store/collection-panel/collection-panel-files/collection-panel-files-reducer.ts
create mode 100644 src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts
create mode 100644 src/store/dialog/dialog-actions.ts
create mode 100644 src/store/dialog/dialog-reducer.test.ts
create mode 100644 src/store/dialog/dialog-reducer.ts
create mode 100644 src/store/dialog/with-dialog.ts
copy src/validators/{create-project/create-project-validator.tsx => create-collection/create-collection-validator.tsx} (70%)
create mode 100644 src/views-components/collection-panel-files/collection-panel-files.ts
create mode 100644 src/views-components/context-menu/action-sets/collection-files-action-set.ts
create mode 100644 src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
create mode 100644 src/views-components/remove-dialog/remove-dialog.tsx
create mode 100644 src/views-components/rename-dialog/rename-dialog.tsx
via 232eac919b067a3783348eab549c9fc555b80abd (commit)
via 196ab384ad4a8126048c1ebd0e2cdbae61469eb6 (commit)
via 303a17641bad0df71ac0450d95941c418e9ac1fb (commit)
via 1121d0dbc1e26350b1063f110d9e90ccdd0f91e8 (commit)
via b1af5d719929e196113468164aed5b5d9e141450 (commit)
via 185beca2556c6a165f494ae941e06fec1c89fc74 (commit)
via 787e604aba41d4e75716bf99507c02df9fa8cf4d (commit)
via 0a6a8ab679e84f99eedc17aec46a310ef86172c6 (commit)
via daac474f873245093191b4ea3834fba0ffdcc45f (commit)
via 9892f05a26dbba0e49ff99871128723eedbafa6e (commit)
via 219d452e647c01754bf71b91086b15cc9f00027a (commit)
via ada671101ba45837f90ef9fbb2129b243934c159 (commit)
via 9fed03a84c6ef5234d61f7d62c93f7629da2409d (commit)
via 8089fda80143390d021de09b64588cb9ddd1e194 (commit)
via 4a24786b1ab2199d3841226eed83be56a83645fc (commit)
via 27bcade93df26e25bb2b4aff537875f78d3c1ff5 (commit)
via 9438812a13875c06996ed7190f8faf21011910bd (commit)
via fed236cf9d405efed2f5622ae58fd0e9974af30f (commit)
via 51b8343ae1898a4faf7bf083c4f9b5e6eb26b561 (commit)
via 50031c8c6aae1f325f81d71a6f5a8c1cb293aa46 (commit)
via ad5512c3aafbed2e97ea5c24442fcd2d17a35edf (commit)
via 72c12f527787181e4abb09fc968f07e795179c3c (commit)
via 935518acfda7773331e816492d05d005ec44950f (commit)
via 833a5d07f87b31133ade505b82215b9a5d47bdc3 (commit)
via 922a67467d2b7cc9995bbde095d9c2fa5b4518a9 (commit)
via 7395e152908d17d2078ace72f1f8713c4c8a1f41 (commit)
via 4f46e3cc8ebe88041fdd044d81fb39a0f0396f3c (commit)
via 2a4998819eacf85fe1ceefe6bfbcc73e03a87452 (commit)
via e84023ab9caa40e433dbd19ede8f7db6577f78fa (commit)
via 95cac76b24cf817cfc1d825599087833e9ba7742 (commit)
via 540d41f964c7ad3495cead777d6d175ff8f76b53 (commit)
via 772cf27f6c086cc59a71211ca9df74c33414a859 (commit)
via be2f555375b863b5171cebe6375acb4c0267e818 (commit)
via b9b782c0259f06f4ae743389403a6321b84cda1a (commit)
via bc58988320c7c52cad07891d5ed941560fca083f (commit)
via 79a2e3e107a55d8081647b9bf81369aa7e5ad2ac (commit)
via c3cfdfd215a3c6dd547e1358f3e8d24b55665e9d (commit)
via 76e8c0fe945a04cbf0f2cc6d7cab82d2585d639a (commit)
via 1f6bacd062a8ee17a6631fab64b890f2f6d335ab (commit)
via 3120740061c64645fe8a2015c075add657563921 (commit)
via 1c7242e61e9d71c7a37483ec0583dd0256f8ee7e (commit)
via 3402189ee23183fb7b655cd19815950c607b9679 (commit)
via 7eed338e122d5c5f16988acae10d304de15761bf (commit)
via c3b3bdb39e8e0a8ec7368f06a95450a0ef5e572e (commit)
via b79348f1be6a2dce8ceede8bd4c2906fc1098e2b (commit)
via 9072585569eedc1ed276ade47fe9ca16447aff39 (commit)
via 91c6da4c4f84498a8473a0245a70c024ca9910d7 (commit)
via 55bb503e1b885a53ca20fc120c862c7af2db33af (commit)
via 28f13ae4d15f4f80ff3834d6a7422b4259672a20 (commit)
via 9b423a1e4ac7aa6077399da13a3d786df0eed11c (commit)
via 5c58da7d70c60b092123fab999da6227903c7f26 (commit)
via 41c1d2bdade3ee0565a012e13e47142da0bac937 (commit)
via 1e42face4cff8350eed9351d810bf82b83f86576 (commit)
via 42de1303354a30d004095003d6143deaa3f62992 (commit)
from 53fd16f76b1c949c36c4d119e6ca6346af7c643d (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 232eac919b067a3783348eab549c9fc555b80abd
Merge: 53fd16f 196ab38
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Tue Aug 7 11:33:53 2018 +0200
Merge branch 'master' into 13854-tags-card
refs #13854
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --cc src/services/services.ts
index f56a30f,9e1adbf..87c668f
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@@ -8,11 -8,9 +8,10 @@@ import { ProjectService } from "./proje
import { LinkService } from "./link-service/link-service";
import { FavoriteService } from "./favorite-service/favorite-service";
import { AxiosInstance } from "axios";
- import { CommonResourceService } from "../common/api/common-resource-service";
- import { Resource } from "../models/resource";
import { CollectionService } from "./collection-service/collection-service";
+import { TagService } from "./tag-service/tag-service";
import Axios from "axios";
+ import { CollectionFilesService } from "./collection-files-service/collection-files-service";
export interface ServiceRepository {
apiClient: AxiosInstance;
@@@ -22,8 -20,8 +21,9 @@@
projectService: ProjectService;
linkService: LinkService;
favoriteService: FavoriteService;
- collectionService: CommonResourceService<Resource>;
+ tagService: TagService;
+ collectionService: CollectionService;
+ collectionFilesService: CollectionFilesService;
}
export const createServices = (baseUrl: string): ServiceRepository => {
@@@ -36,8 -34,8 +36,9 @@@
const linkService = new LinkService(apiClient);
const favoriteService = new FavoriteService(linkService, groupsService);
const collectionService = new CollectionService(apiClient);
+ const tagService = new TagService(linkService);
-
+ const collectionFilesService = new CollectionFilesService(collectionService);
+
return {
apiClient,
authService,
@@@ -46,6 -44,6 +47,7 @@@
linkService,
favoriteService,
collectionService,
- tagService
++ tagService,
+ collectionFilesService
};
};
diff --cc src/store/collection-panel/collection-panel-action.ts
index f9994d7,ee95590..f2774f6
--- a/src/store/collection-panel/collection-panel-action.ts
+++ b/src/store/collection-panel/collection-panel-action.ts
@@@ -6,10 -6,10 +6,12 @@@ import { unionize, ofType, UnionOf } fr
import { Dispatch } from "redux";
import { ResourceKind } from "../../models/resource";
import { CollectionResource } from "../../models/collection";
+ import { collectionPanelFilesAction } from "./collection-panel-files/collection-panel-files-actions";
+ import { createTree } from "../../models/tree";
import { RootState } from "../store";
import { ServiceRepository } from "../../services/services";
+import { TagResource, TagProperty } from "../../models/tag";
+import { snackbarActions } from "../snackbar/snackbar-actions";
export const collectionPanelActions = unionize({
LOAD_COLLECTION: ofType<{ uuid: string, kind: ResourceKind }>(),
diff --cc src/views/collection-panel/collection-panel.tsx
index aac5661,43423a6..489d284
--- a/src/views/collection-panel/collection-panel.tsx
+++ b/src/views/collection-panel/collection-panel.tsx
@@@ -3,23 -3,21 +3,24 @@@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
- import {
- StyleRulesCallback, WithStyles, withStyles, Card,
- CardHeader, IconButton, CardContent, Grid, Chip, TextField, Button
+ import {
+ StyleRulesCallback, WithStyles, withStyles, Card,
+ CardHeader, IconButton, CardContent, Grid, Chip
} from '@material-ui/core';
-import { connect } from 'react-redux';
+import { connect, DispatchProp } from "react-redux";
import { RouteComponentProps } from 'react-router';
import { ArvadosTheme } from '../../common/custom-theme';
import { RootState } from '../../store/store';
import { MoreOptionsIcon, CollectionIcon, CopyIcon } from '../../components/icon/icon';
import { DetailsAttribute } from '../../components/details-attribute/details-attribute';
import { CollectionResource } from '../../models/collection';
+ import { CollectionPanelFiles } from '../../views-components/collection-panel-files/collection-panel-files';
import * as CopyToClipboard from 'react-copy-to-clipboard';
+import { TagResource } from '../../models/tag';
+import { CollectionTagForm } from './collection-tag-form';
+import { deleteCollectionTag } from '../../store/collection-panel/collection-panel-action';
-type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon';
+type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon' | 'value';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
card: {
@@@ -59,19 -51,16 +60,19 @@@ type CollectionPanelProps = CollectionP
export const CollectionPanel = withStyles(styles)(
- connect((state: RootState) => ({ item: state.collectionPanel.item! }))(
- class extends React.Component<CollectionPanelProps> {
+ connect((state: RootState) => ({
+ item: state.collectionPanel.item,
+ tags: state.collectionPanel.tags
+ }))(
+ class extends React.Component<CollectionPanelProps> {
render() {
- const { classes, item, onContextMenu } = this.props;
+ const { classes, item, tags, onContextMenu } = this.props;
return <div>
<Card className={classes.card}>
- <CardHeader
+ <CardHeader
avatar={ <CollectionIcon className={classes.iconHeader} /> }
- action={
+ action={
<IconButton
aria-label="More options"
onClick={event => onContextMenu(event, item)}>
@@@ -142,8 -111,3 +135,8 @@@
}
)
);
+
+const renderTagLabel = (tag: TagResource) => {
+ const { properties } = tag;
+ return `${properties.key}: ${properties.value}`;
- };
++};
diff --cc src/views/workbench/workbench.tsx
index 8491d17,3611d7b..69d8098
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -34,13 -34,15 +34,14 @@@ import { ResourceKind } from '../../mod
import { ContextMenu, ContextMenuKind } 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 { dataExplorerActions } from '../../store/data-explorer/data-explorer-action';
import { Snackbar } from '../../views-components/snackbar/snackbar';
import { favoritePanelActions } from '../../store/favorite-panel/favorite-panel-action';
import { CreateCollectionDialog } from '../../views-components/create-collection-dialog/create-collection-dialog';
import { CollectionPanel } from '../collection-panel/collection-panel';
-import { loadCollection } from '../../store/collection-panel/collection-panel-action';
+import { loadCollection, loadCollectionTags } from '../../store/collection-panel/collection-panel-action';
import { getCollectionUrl } from '../../models/collection';
+ import { RemoveDialog } from '../../views-components/remove-dialog/remove-dialog';
+ import { RenameDialog } from '../../views-components/rename-dialog/rename-dialog';
import { UpdateCollectionDialog } from '../../views-components/update-collection-dialog/update-collection-dialog.';
import { AuthService } from "../../services/auth-service/auth-service";
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list