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@contractors.roche.com>

diff --cc src/services/services.ts
index 87c668f2ae4ca3ff3e9b36e0f6bb16d3c51a96e8,6e8d0f94c4e330d8cc88ddfe23af79414c2df31f..e77b5d3aa89b18a5fa8d4e1f3b2de2826f93f523
--- 1/src/services/services.ts
--- 2/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 c3019a650e313b7b6f44bb19290199f0234972ff,0000000000000000000000000000000000000000..084603eb0833a9f64211598acc899e2d96a95288
mode 100644,000000..100644
--- 1/src/services/tag-service/tag-service.ts
--- /dev/null
+++ b/src/services/tag-service/tag-service.ts
@@@ -1,45 -1,0 +1,45 @@@
-             .create<TagResource>()
 +// 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()
 +            .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 874ce138c76e456ff798e3d63edb88a4d3aa79e2,6083b640fe766f045673406565479487e145d1a9..804aae11f72f3e85f69eab01660b121d8a789b5f
--- 1/src/views-components/dialog-create/dialog-collection-create.tsx
--- 2/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 08eee418bdc1f2bf016c0e575e0d751b3d96137c,dc278018e1841ec5ca1b1363db44272251cacc3b..febe1124b2f9f00ca1087086322eb5f1bfcb9ce8
--- 1/src/views-components/dialog-update/dialog-collection-update.tsx
--- 2/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';