From f1eb4c625f09214d49b7c3724ece606efc49d1c3 Mon Sep 17 00:00:00 2001
From: shanshuirenjia <978987373@qq.com>
Date: Tue, 11 Dec 2018 17:52:19 +0800
Subject: [PATCH] repair goto repo bug

---
 frontend/src/app.js                           | 46 +++++++++++++++----
 .../src/components/cur-dir-path/dir-path.js   | 13 ++++--
 frontend/src/components/cur-dir-path/index.js |  2 +
 frontend/src/components/dir-view/dir-panel.js |  2 +
 frontend/src/components/dir-view/dir-view.js  | 13 ++----
 frontend/src/components/main-side-nav.js      |  6 +--
 .../shared-repo-list-item.js                  |  5 +-
 7 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/frontend/src/app.js b/frontend/src/app.js
index 050c4cf36e..12f519726f 100644
--- a/frontend/src/app.js
+++ b/frontend/src/app.js
@@ -1,7 +1,7 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import ReactDOM from 'react-dom';
 import { Router } from '@reach/router';
-import { siteRoot } from './utils/constants';
+import { gettext, siteRoot } from './utils/constants';
 import SidePanel from './components/side-panel';
 import MainPanel from './components/main-panel';
 import DraftsView from './pages/drafts/drafts-view';
@@ -52,8 +52,8 @@ class App extends Component {
       draftList:[],
       isLoadingDraft: true,
       currentTab: '/',
+      pathPrefix: null,
     };
-    this.currentTab = ''; //just for refresh brower
   }
 
   componentDidMount() {
@@ -101,12 +101,42 @@ class App extends Component {
     //todos
   }
 
-  tabItemClick = (tabName) => {
-    this.setState({currentTab: tabName});
+  tabItemClick = (tabName, groupID) => {
+    let pathPrefix = this.generatorPrefix(tabName, groupID);
+    this.setState({
+      currentTab: tabName,
+      pathPrefix: pathPrefix
+    });
   } 
 
-  updateCurrentTab = (tabName) => {
-    this.currentTab = tabName;
+  generatorPrefix = (currentTab, groupID) => {
+    if (groupID) { //group
+      return (
+        <Fragment>
+          <a href={siteRoot + 'groups/'} className="normal">{gettext('Groups')}</a>
+          <span className="path-split">/</span>
+          <a href={siteRoot + 'group/' + groupID + '/'} className="normal">{currentTab}</a>
+          <span className="path-split">/</span>
+        </Fragment>
+      );
+    }
+    if (currentTab === 'my-libs') {
+      return (
+        <Fragment>
+          <a href={siteRoot + 'my-libs/'} className="normal">{gettext('Libraries')}</a>
+          <span className="path-split">/</span>
+        </Fragment>
+      );
+    }
+    if (currentTab === 'shared-libs') {
+      return (
+        <Fragment>
+          <a href={siteRoot + 'shared-libs/'} className="normal">{gettext('Shared with me')}</a>
+          <span className="path-split">/</span>
+        </Fragment>
+      );
+    }
+    return null;
   }
 
   render() {
@@ -141,7 +171,7 @@ class App extends Component {
             <ShareAdminUploadLinksWrapper path={siteRoot + 'share-admin-upload-links'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />
             <SharedLibrariesWrapper path={siteRoot + 'shared-libs'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />
             <MyLibraries path={siteRoot + 'my-libs'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />
-            <DirView path={siteRoot + 'library/:repoID/*'} onMenuClick={this.onShowSidePanel} updateCurrentTab={this.updateCurrentTab}/>
+            <DirView path={siteRoot + 'library/:repoID/*'} pathPrefix={this.state.pathPrefix} onMenuClick={this.onShowSidePanel}/>
             <Groups path={siteRoot + 'groups'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick}/>
             <Group path={siteRoot + 'group/:groupID'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick}/>
             <WikisWrapper path={siteRoot + 'wikis'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick}/>
diff --git a/frontend/src/components/cur-dir-path/dir-path.js b/frontend/src/components/cur-dir-path/dir-path.js
index 92ae0c6429..c1771ca591 100644
--- a/frontend/src/components/cur-dir-path/dir-path.js
+++ b/frontend/src/components/cur-dir-path/dir-path.js
@@ -1,9 +1,10 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { siteRoot, gettext } from '../../utils/constants';
 
 const propTypes = {
   repoName: PropTypes.string.isRequired,
+  pathPrefix: PropTypes.object,
   currentPath: PropTypes.string.isRequired,
   onPathClick: PropTypes.func.isRequired,
 };
@@ -43,10 +44,16 @@ class DirPath extends React.Component {
   render() {
     let { currentPath, repoName } = this.props;
     let pathElem = this.turnPathToLink(currentPath);
+    let pathPrefix = this.props.pathPrefix !== undefined ? this.props.pathPrefix : false;
     return (
       <div className="path-containter">
-        <a href={siteRoot + 'my-libs/'} className="normal">{gettext('Libraries')}</a>
-        <span className="path-split">/</span>
+        {pathPrefix ? 
+          pathPrefix :
+            <Fragment>
+              <a href={siteRoot + 'my-libs/'} className="normal">{gettext('Libraries')}</a>
+              <span className="path-split">/</span>
+            </Fragment>       
+        }
         {currentPath === '/' ?
           <span>{repoName}</span>:
           <a className="path-link" data-path="/" onClick={this.onPathClick}>{repoName}</a>
diff --git a/frontend/src/components/cur-dir-path/index.js b/frontend/src/components/cur-dir-path/index.js
index 59215351a4..fbacc1e922 100644
--- a/frontend/src/components/cur-dir-path/index.js
+++ b/frontend/src/components/cur-dir-path/index.js
@@ -5,6 +5,7 @@ import DirTool from './dir-tool';
 
 const propTypes = {
   repoID: PropTypes.string.isRequired,
+  pathPrefix: PropTypes.object.isRequired,
   repoName: PropTypes.string.isRequired,
   permission: PropTypes.bool.isRequired,
   currentPath: PropTypes.string.isRequired,
@@ -18,6 +19,7 @@ class CurDirPath extends React.Component {
       <Fragment>
         <DirPath 
           repoName={this.props.repoName}
+          pathPrefix={this.props.pathPrefix}
           currentPath={this.props.currentPath}
           onPathClick={this.props.onPathClick}
         />
diff --git a/frontend/src/components/dir-view/dir-panel.js b/frontend/src/components/dir-view/dir-panel.js
index cc7ce5a04a..63034f10ac 100644
--- a/frontend/src/components/dir-view/dir-panel.js
+++ b/frontend/src/components/dir-view/dir-panel.js
@@ -14,6 +14,7 @@ import FileUploader from '../file-uploader/file-uploader';
 
 const propTypes = {
   currentRepo: PropTypes.object,
+  pathPrefix: PropTypes.object.isRequired,
   path: PropTypes.string.isRequired,
   repoID: PropTypes.string.isRequired,
   repoName: PropTypes.string.isRequired,
@@ -147,6 +148,7 @@ class DirPanel extends React.Component {
               <CurDirPath 
                 repoID={this.props.repoID}
                 repoName={this.props.repoName}
+                pathPrefix={this.props.pathPrefix}
                 currentPath={this.props.path} 
                 permission={this.props.permission}
                 onPathClick={this.props.onPathClick}
diff --git a/frontend/src/components/dir-view/dir-view.js b/frontend/src/components/dir-view/dir-view.js
index 8a5dc2a320..6d2d684995 100644
--- a/frontend/src/components/dir-view/dir-view.js
+++ b/frontend/src/components/dir-view/dir-view.js
@@ -11,8 +11,8 @@ import FileTag from '../../models/file-tag';
 import Repo from '../../models/repo';
 
 const propTypes = {
+  pathPrefix: PropTypes.object.isRequired,
   onMenuClick: PropTypes.func.isRequired,
-  updateCurrentTab: PropTypes.func.isRequired,
 };
 
 class DirView extends React.Component {
@@ -53,15 +53,9 @@ class DirView extends React.Component {
         permission: repo.permission === 'rw',
         currentRepo: repo,
       });
-      
-      let repoName = encodeURIComponent(repo.repo_name);
-      let index = location.href.indexOf(repoName) + repoName.length;
-      let path = decodeURIComponent(location.href.slice(index));
-      this.setState({path: path});
-      this.updateDirentList(path);
-    });
 
-    this.props.updateCurrentTab('my-libs'); // just for refersh brower;
+      this.updateDirentList(this.state.path);
+    });
   }
   
   updateDirentList = (filePath) => {
@@ -430,6 +424,7 @@ class DirView extends React.Component {
   render() {
     return (
       <DirPanel 
+        pathPrefix={this.props.pathPrefix}
         currentRepo={this.state.currentRepo}
         path={this.state.path}
         pathExist={this.state.pathExit}
diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js
index c33eff4d7e..ccb69f9f4a 100644
--- a/frontend/src/components/main-side-nav.js
+++ b/frontend/src/components/main-side-nav.js
@@ -52,8 +52,8 @@ class MainSideNav extends React.Component {
     });
   }
 
-  tabItemClick = (param) => {
-    this.props.tabItemClick(param);
+  tabItemClick = (param, id) => {
+    this.props.tabItemClick(param, id);
   }
 
   getActiveClass = (tab) => {
@@ -76,7 +76,7 @@ class MainSideNav extends React.Component {
         {this.state.groupItems.map(item => {
           return (
             <li key={item.id} className="nav-item"> 
-              <Link to={siteRoot + 'group/' + item.id + '/'} className={`nav-link ellipsis ${this.getActiveClass(item.id)}`} onClick={() => this.tabItemClick(item.id)}>
+              <Link to={siteRoot + 'group/' + item.id + '/'} className={`nav-link ellipsis ${this.getActiveClass(item.name)}`} onClick={() => this.tabItemClick(item.name, item.id)}>
                 <span className="sharp" aria-hidden="true">#</span>
                 <span className="nav-text">{item.name}</span>
               </Link>
diff --git a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
index 3f47415558..ebf8ad26e9 100644
--- a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
+++ b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
@@ -2,6 +2,7 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import moment from 'moment';
 import { Dropdown, DropdownMenu, DropdownToggle, DropdownItem } from 'reactstrap';
+import { Link } from '@reach/router';
 import { Utils } from '../../utils/utils';
 import { gettext, siteRoot, isPro, username, folderPermEnabled } from '../../utils/constants';
 
@@ -91,7 +92,7 @@ class SharedRepoListItem extends React.Component {
     });
 
     //todo change to library; div-view is not compatibility
-    let libPath = `${siteRoot}#group/${currentGroup.id}/lib/${this.props.repo.repo_id}/`;
+    let libPath = `${siteRoot}library/${this.props.repo.repo_id}/`;
 
     return { iconUrl, iconTitle, libPath };
   }
@@ -269,7 +270,7 @@ class SharedRepoListItem extends React.Component {
     return (
       <tr className={this.state.highlight ? 'tr-highlight' : ''} onMouseEnter={this.onMouseEnter} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave}>
         <td><img src={iconUrl} title={repo.iconTitle} alt={iconTitle} width="24" /></td>
-        <td><a href={libPath}>{repo.repo_name}</a></td>
+        <td><Link to={libPath}>{repo.repo_name}</Link></td>
         <td>{this.state.isOperationShow && this.generatorPCMenu()}</td>
         <td>{repo.size}</td>
         <td title={moment(repo.last_modified).format('llll')}>{moment(repo.last_modified).fromNow()}</td>