Merge branch 'master' into 13990-collection-files-service-based-on-webdav

[arvados-workbench2.git] / src / store / collection-panel / collection-panel-files / collection-panel-files-state.ts

diff --git a/src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts b/src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts
index d6f2fa4a98db7d340081c450a7a4c9e05be06bb0..35b81d2e121e134b1b10f8aad6223a0267da9765 100644 (file)
--- a/src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts
+++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { CollectionFile, CollectionDirectory, CollectionFileType } from '../../../models/collection-file';
-import { Tree, TreeNode } from '../../../models/tree';
+import { Tree, TreeNode, mapTreeValues, getNodeValue } from '~/models/tree';
+import { CollectionFile, CollectionDirectory, CollectionFileType } from '~/models/collection-file';
 
 export type CollectionPanelFilesState = Tree<CollectionPanelDirectory | CollectionPanelFile>;
 
@@ -23,4 +23,15 @@ export const mapCollectionFileToCollectionPanelFile = (node: TreeNode<Collection
             ? { ...node.value, selected: false, collapsed: true }
             : { ...node.value, selected: false }
     };
-};
\ No newline at end of file
+};
+
+export const mergeCollectionPanelFilesStates = (oldState: CollectionPanelFilesState, newState: CollectionPanelFilesState) => {
+    return mapTreeValues((value: CollectionPanelDirectory | CollectionPanelFile) => {
+        const oldValue = getNodeValue(value.id)(oldState);
+        return oldValue
+            ? oldValue.type === CollectionFileType.DIRECTORY
+                ? { ...value, collapsed: oldValue.collapsed, selected: oldValue.selected }
+                : { ...value, selected: oldValue.selected }
+            : value;
+    })(newState);
+};