From 91f2d95a5c9ea2d58e8412e56e489d6c6b6670bb Mon Sep 17 00:00:00 2001
From: Boris Sekachev <40690378+bsekachev@users.noreply.github.com>
Date: Mon, 30 Dec 2019 12:44:01 +0300
Subject: [PATCH] Added root folder for share functionality (#1005)

---
 cvat-ui/src/components/file-manager/file-manager.tsx | 2 ++
 cvat-ui/src/containers/file-manager/file-manager.tsx | 6 +++---
 cvat-ui/src/reducers/share-reducer.ts                | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cvat-ui/src/components/file-manager/file-manager.tsx b/cvat-ui/src/components/file-manager/file-manager.tsx
index 81db320bf3eb..c2bfd46cb76f 100644
--- a/cvat-ui/src/components/file-manager/file-manager.tsx
+++ b/cvat-ui/src/components/file-manager/file-manager.tsx
@@ -216,11 +216,13 @@ export default class FileManager extends React.PureComponent<Props, State> {
 
     public render(): JSX.Element {
         const { withRemote } = this.props;
+        const { active } = this.state;
 
         return (
             <>
                 <Tabs
                     type='card'
+                    activeKey={active}
                     tabBarGutter={5}
                     onChange={
                         (activeKey: string): void => this.setState({
diff --git a/cvat-ui/src/containers/file-manager/file-manager.tsx b/cvat-ui/src/containers/file-manager/file-manager.tsx
index 40147d1111e2..4e7a9ca5170b 100644
--- a/cvat-ui/src/containers/file-manager/file-manager.tsx
+++ b/cvat-ui/src/containers/file-manager/file-manager.tsx
@@ -26,10 +26,10 @@ interface DispatchToProps {
 function mapStateToProps(state: CombinedState): StateToProps {
     function convert(items: ShareItem[], path?: string): TreeNodeNormal[] {
         return items.map((item): TreeNodeNormal => {
-            const key = `${path}/${item.name}`.replace(/\/+/g, '/'); // // => /
+            const key = `${path}${item.name}/`;
             return {
                 key,
-                title: item.name,
+                title: item.name || 'root',
                 isLeaf: item.type !== 'DIR',
                 children: convert(item.children, key),
             };
@@ -38,7 +38,7 @@ function mapStateToProps(state: CombinedState): StateToProps {
 
     const { root } = state.share;
     return {
-        treeData: convert(root.children, root.name),
+        treeData: convert([root], ''),
     };
 }
 
diff --git a/cvat-ui/src/reducers/share-reducer.ts b/cvat-ui/src/reducers/share-reducer.ts
index 185bf2565e90..e1c6dcae5c12 100644
--- a/cvat-ui/src/reducers/share-reducer.ts
+++ b/cvat-ui/src/reducers/share-reducer.ts
@@ -10,7 +10,7 @@ import {
 
 const defaultState: ShareState = {
     root: {
-        name: '/',
+        name: '',
         type: 'DIR',
         children: [],
     },