Added root folder for share functionality (cvat-ai#1005)

cleemesser · Mar 5, 2020 · 91f2d95 · 91f2d95
1 parent bb5ee67
commit 91f2d95
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -10,7 +10,7 @@ import {
 
 const defaultState: ShareState = {
     root: {
-        name: '/',
+        name: '',
         type: 'DIR',
         children: [],
     },