[ARVADOS-WORKBENCH2] updated: 1.1.4-559-g40952ad
Git user
git at public.curoverse.com
Tue Aug 7 07:34:24 EDT 2018
Summary of changes:
package.json | 2 +
src/common/api/common-resource-service.ts | 6 +-
src/common/api/filter-builder.ts | 21 ++---
src/common/formatters.ts | 14 ++-
.../collection-panel-files.tsx | 25 ++++-
src/components/file-upload/file-upload.tsx | 84 +++++++++++++++++
src/components/icon/icon.tsx | 2 +
src/models/collection-file.ts | 14 ++-
src/models/keep.ts | 12 +++
.../collection-files-service.ts | 49 +++++++++-
.../collection-manifest-mapper.test.ts | 48 ++++++++--
.../collection-manifest-mapper.ts | 33 +++++--
.../collection-manifest-parser.test.ts | 14 ++-
.../collection-manifest-parser.ts | 15 ++-
.../collection-service/collection-service.ts | 101 ++++++++++++++++++++-
.../favorite-service/favorite-service.test.ts | 8 +-
src/services/favorite-service/favorite-service.ts | 10 +-
.../keep-service.ts} | 26 +++---
.../project-service/project-service.test.ts | 2 +-
src/services/project-service/project-service.ts | 2 +-
src/services/services.ts | 6 +-
src/services/tag-service/tag-service.ts | 4 +-
.../collection-panel-files-reducer.test.ts | 22 ++---
src/store/collections/collections-reducer.ts | 17 ++--
.../creator/collection-creator-action.ts | 24 ++++-
.../creator/collection-creator-reducer.test.ts | 10 +-
.../creator/collection-creator-reducer.ts | 8 +-
.../collection-updater-action.ts} | 24 ++---
.../updater/collection-updater-reducer.ts | 29 ++++++
.../updator/collection-updator-reducer.ts | 31 -------
.../uploader/collection-uploader-actions.ts | 28 ++++++
.../uploader/collection-uploader-reducer.ts | 39 ++++++++
.../favorite-panel-middleware-service.ts | 2 +-
.../project-panel-middleware-service.ts | 8 +-
src/store/project/project-action.ts | 8 +-
.../action-sets/collection-action-set.ts | 6 +-
.../create-collection-dialog.tsx | 12 +--
.../dialog-create/dialog-collection-create.tsx | 31 +++++--
.../dialog-update/dialog-collection-update.tsx | 4 +-
.../update-collection-dialog..tsx | 8 +-
yarn.lock | 19 ++++
41 files changed, 639 insertions(+), 189 deletions(-)
create mode 100644 src/components/file-upload/file-upload.tsx
create mode 100644 src/models/keep.ts
copy src/services/{link-service/link-service.ts => keep-service/keep-service.ts} (61%)
rename src/store/collections/{updator/collection-updator-action.ts => updater/collection-updater-action.ts} (72%)
create mode 100644 src/store/collections/updater/collection-updater-reducer.ts
delete mode 100644 src/store/collections/updator/collection-updator-reducer.ts
create mode 100644 src/store/collections/uploader/collection-uploader-actions.ts
create mode 100644 src/store/collections/uploader/collection-uploader-reducer.ts
via 40952ad86a823635968c9abc5d6feacef316cffd (commit)
via a8198231beab18f4dd24f7538791a66dd698d028 (commit)
via 2b95c9dce888f19bdefae5add1f65847da72f1a2 (commit)
via 961394c0876cdc07f2195d3bc1843a5c9a6fa950 (commit)
via f1bbac648067f651d408d3cad39fd31d9a36354d (commit)
via 6e830f14ac2732c6d8661275fff691dd8a6179fa (commit)
via b58e3122a2574d81618bca58e27b046f82400f49 (commit)
via 7a398ca38d58b3f81c05cb72a241095a94fe0ca9 (commit)
via be4d5a950e31200e907cd379cf9210a7c3dd8643 (commit)
via 905f260842e2863ca42d27fcefcfa94d1cc45267 (commit)
via ed9321c52cef8fbb9f29d4cf1c2145fbfa90f297 (commit)
via 5f0f59db625c1338428983dfae039e178294dfa7 (commit)
via 0ec0b803cfbd96a0262626052a990df9af41bfdf (commit)
via 67d7540c8d035c70091457ea4b0f2d554a16bf84 (commit)
via 5c53f8b627cc92bb9d642159c4d7e3ad1ddf494d (commit)
via 6fbcbe191d8356ad2029e79ad961c983b2284afd (commit)
via c0afd448c39a41d229612afe47643aed7a2cf5dd (commit)
via 9a21854c2f9f76d0c5cc8b95972beba857444c5d (commit)
from e1aac257a34c4c0210ea1663a7f6dd0b9c482e5d (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 40952ad86a823635968c9abc5d6feacef316cffd
Merge: e1aac25 a819823
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date: Tue Aug 7 13:34:15 2018 +0200
refs #13856 Merge branch 'origin/13856-upload-component'
# Conflicts:
# src/services/services.ts
# src/views-components/dialog-create/dialog-collection-create.tsx
# src/views-components/dialog-update/dialog-collection-update.tsx
Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>
diff --cc src/services/services.ts
index 87c668f,6e8d0f9..e77b5d3
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@@ -9,9 -9,9 +9,10 @@@ import { LinkService } from "./link-ser
import { FavoriteService } from "./favorite-service/favorite-service";
import { AxiosInstance } from "axios";
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";
+ import { KeepService } from "./keep-service/keep-service";
export interface ServiceRepository {
apiClient: AxiosInstance;
@@@ -35,8 -36,7 +38,8 @@@ export const createServices = (baseUrl
const projectService = new ProjectService(apiClient);
const linkService = new LinkService(apiClient);
const favoriteService = new FavoriteService(linkService, groupsService);
- const collectionService = new CollectionService(apiClient);
+ const collectionService = new CollectionService(apiClient, keepService);
+ const tagService = new TagService(linkService);
const collectionFilesService = new CollectionFilesService(collectionService);
return {
diff --cc src/services/tag-service/tag-service.ts
index c3019a6,0000000..084603e
mode 100644,000000..100644
--- a/src/services/tag-service/tag-service.ts
+++ b/src/services/tag-service/tag-service.ts
@@@ -1,45 -1,0 +1,45 @@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { LinkService } from "../link-service/link-service";
+import { LinkClass } from "../../models/link";
+import { FilterBuilder } from "../../common/api/filter-builder";
+import { TagTailType, TagResource } from "../../models/tag";
+import { OrderBuilder } from "../../common/api/order-builder";
+
+export class TagService {
+
+ constructor(private linkService: LinkService) { }
+
+ create(uuid: string, data: { key: string; value: string } ) {
+ return this.linkService
+ .create({
+ headUuid: uuid,
+ tailUuid: TagTailType.COLLECTION,
+ linkClass: LinkClass.TAG,
+ name: '',
+ properties: data
+ })
+ .then(tag => tag as TagResource );
+ }
+
+ list(uuid: string) {
+ const filters = FilterBuilder
- .create<TagResource>()
++ .create()
+ .addEqual("headUuid", uuid)
+ .addEqual("tailUuid", TagTailType.COLLECTION)
+ .addEqual("linkClass", LinkClass.TAG);
+
+ const order = OrderBuilder
+ .create<TagResource>()
+ .addAsc('createdAt');
+
+ return this.linkService
+ .list({ filters, order })
+ .then(results => {
+ return results.items.map((tag => tag as TagResource ));
+ });
+ }
+
- }
++}
diff --cc src/views-components/dialog-create/dialog-collection-create.tsx
index 874ce13,6083b64..804aae1
--- a/src/views-components/dialog-create/dialog-collection-create.tsx
+++ b/src/views-components/dialog-create/dialog-collection-create.tsx
@@@ -12,7 -12,11 +12,11 @@@ import DialogContent from '@material-ui
import DialogTitle from '@material-ui/core/DialogTitle';
import { Button, StyleRulesCallback, WithStyles, withStyles, CircularProgress } from '@material-ui/core';
-import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '../../validators/create-project/create-project-validator';
+import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '../../validators/create-collection/create-collection-validator';
+ import { FileUpload } from "../../components/file-upload/file-upload";
+ import { connect, DispatchProp } from "react-redux";
+ import { RootState } from "../../store/store";
+ import { collectionUploaderActions, UploadFile } from "../../store/collections/uploader/collection-uploader-actions";
type CssRules = "button" | "lastButton" | "formContainer" | "textField" | "createProgress" | "dialogActions";
diff --cc src/views-components/dialog-update/dialog-collection-update.tsx
index 08eee41,dc27801..febe112
--- a/src/views-components/dialog-update/dialog-collection-update.tsx
+++ b/src/views-components/dialog-update/dialog-collection-update.tsx
@@@ -7,8 -7,8 +7,8 @@@ import { reduxForm, Field } from 'redux
import { compose } from 'redux';
import { ArvadosTheme } from '../../common/custom-theme';
import { Dialog, DialogActions, DialogContent, DialogTitle, TextField, StyleRulesCallback, withStyles, WithStyles, Button, CircularProgress } from '../../../node_modules/@material-ui/core';
-import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '../../validators/create-project/create-project-validator';
+import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '../../validators/create-collection/create-collection-validator';
- import { COLLECTION_FORM_NAME } from '../../store/collections/updator/collection-updator-action';
+ import { COLLECTION_FORM_NAME } from '../../store/collections/updater/collection-updater-action';
type CssRules = 'content' | 'actions' | 'textField' | 'buttonWrapper' | 'saveButton' | 'circularProgress';
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list