X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/158a4936f754ad78004e1bbcbb5af053a6a4073a..da3ae51b7b3b63561a9e1c47c965f45a08225d34:/src/services/collection-service/collection-service-files-response.ts

diff --git a/src/services/collection-service/collection-service-files-response.ts b/src/services/collection-service/collection-service-files-response.ts
index 4545096f..b8a7970d 100644
--- a/src/services/collection-service/collection-service-files-response.ts
+++ b/src/services/collection-service/collection-service-files-response.ts
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { createCollectionFilesTree, CollectionDirectory, CollectionFile, CollectionFileType, createCollectionDirectory, createCollectionFile } from "../../models/collection-file";
-import { Tree, mapTree, getNodeChildren, getNode, TreeNode } from "../../models/tree";
-import { getTagValue } from "../../common/xml";
+import { getTagValue } from "~/common/xml";
+import { getNodeChildren, Tree, mapTree } from '~/models/tree';
 
 export const parseFilesResponse = (document: Document) => {
     const files = extractFilesData(document);
@@ -13,14 +13,15 @@ export const parseFilesResponse = (document: Document) => {
 };
 
 export const sortFilesTree = (tree: Tree<CollectionDirectory | CollectionFile>) => {
-    return mapTree(node => {
-        const children = getNodeChildren(node.id)(tree).map(id => getNode(id)(tree)) as TreeNode<CollectionDirectory | CollectionFile>[];
+    return mapTree<CollectionDirectory | CollectionFile>(node => {
+        const children = getNodeChildren(node.id)(tree);
+
         children.sort((a, b) =>
             a.value.type !== b.value.type
                 ? a.value.type === CollectionFileType.DIRECTORY ? -1 : 1
                 : a.value.name.localeCompare(b.value.name)
         );
-        return { ...node, children: children.map(child => child.id) } as TreeNode<CollectionDirectory | CollectionFile>;
+        return { ...node, children: children.map(child => child.id) };
     })(tree);
 };
 
@@ -32,14 +33,14 @@ export const extractFilesData = (document: Document) => {
         .map(element => {
             const name = getTagValue(element, 'D:displayname', '');
             const size = parseInt(getTagValue(element, 'D:getcontentlength', '0'), 10);
-            const pathname = getTagValue(element, 'D:href', '');
+            const url = getTagValue(element, 'D:href', '');
             const nameSuffix = `/${name || ''}`;
-            const directory = pathname
+            const directory = url
                 .replace(collectionUrlPrefix, '')
                 .replace(nameSuffix, '');
 
             const data = {
-                url: pathname,
+                url,
                 id: `${directory}/${name}`,
                 name,
                 path: directory,