Merge lates changes

Feature #14013

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --cc src/services/collection-service/collection-service.ts
index c611f3668d9637917b6e7f02c2c4b97ef5d6d012,d07ef216ac0c51b7e14dbbccff967642e6c3db22..b154f40a951235aeed7f8b558baa297fe5bafbb3
--- 1/src/services/collection-service/collection-service.ts
--- 2/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@@ -2,15 -2,20 +2,15 @@@
  //
  // SPDX-License-Identifier: AGPL-3.0
  
- import { CommonResourceService } from "../../common/api/common-resource-service";
- import { CollectionResource } from "../../models/collection";
 -import * as _ from "lodash";
+ import { CommonResourceService } from "~/common/api/common-resource-service";
+ import { CollectionResource } from "~/models/collection";
 -import axios, { AxiosInstance } from "axios";
 -import { KeepService } from "../keep-service/keep-service";
 +import { AxiosInstance } from "axios";
- import { CollectionFile, CollectionDirectory } from "../../models/collection-file";
- import { WebDAV } from "../../common/webdav";
++import { CollectionFile, CollectionDirectory } from "~/models/collection-file";
+ import { WebDAV } from "~/common/webdav";
  import { AuthService } from "../auth-service/auth-service";
- import { mapTreeValues } from "../../models/tree";
 -import { mapTree, getNodeChildren, getNode, TreeNode } from "../../models/tree";
 -import { getTagValue } from "~/common/xml";
 -import { FilterBuilder } from "~/common/api/filter-builder";
 -import { CollectionFile, createCollectionFile, CollectionFileType, CollectionDirectory, createCollectionDirectory } from '~/models/collection-file';
 -import { parseKeepManifestText, stringifyKeepManifest } from "../collection-files-service/collection-manifest-parser";
 -import { KeepManifestStream } from "~/models/keep-manifest";
 -import { createCollectionFilesTree } from '~/models/collection-file';
++import { mapTreeValues } from "~/models/tree";
 +import { parseFilesResponse } from "./collection-service-files-response";
- import { fileToArrayBuffer } from "../../common/file";
++import { fileToArrayBuffer } from "~/common/file";
  
  export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
  

diff --cc src/services/services.ts
Simple merge

diff --cc src/store/collections/creator/collection-creator-action.ts
Simple merge