fixed sidebar filter and route for url '/'

src/action-creator.async.js

@@ -13,12 +13,10 @@ import {
   setUserRole,
   WORKSPACE,
   WORKSPACE_LIST,
-  updateWorkspaceListData,
   FOLDER,
   setFolderData,
   APP_LIST,
-  setAppList,
-  setWorkspaceListIsOpenInSidebar
+  setAppList
 } from './action-creator.sync.js'
 
 /*
@@ -155,17 +153,13 @@ export const updateUserLang = newLang => async dispatch => { // unused
 //   console.log('jsonResponseNoData', fetchResponseNoData)
 // }
 
-export const getWorkspaceList = (userId, workspaceIdToOpen) => async dispatch => {
-  const fetchGetWorkspaceList = await fetchWrapper({
+export const getWorkspaceList = userId => dispatch => {
+  return fetchWrapper({
     url: `${FETCH_CONFIG.mockApiUrl}/user/${userId}/workspace`,
     param: {...FETCH_CONFIG.header, method: 'GET'},
     actionName: WORKSPACE_LIST,
     dispatch
   })
-  if (fetchGetWorkspaceList.status === 200) {
-    dispatch(updateWorkspaceListData(fetchGetWorkspaceList.json))
-    dispatch(setWorkspaceListIsOpenInSidebar(workspaceIdToOpen, true))
-  }
 }
 
 export const getWorkspaceContent = workspaceId => dispatch => {

src/component/Sidebar/WorkspaceListItem.jsx

@@ -95,7 +95,7 @@ const WorkspaceListItem = props => {
 
                 <div className='dropdown__title' id='navbarDropdown'>
                   <div className='dropdown__title__text'>
-                    { props.app[a].label[props.lang.id] }
+                    {props.app[a].label[props.lang.id]}
                   </div>
                 </div>
               </div>

src/container/Sidebar.jsx

@@ -4,7 +4,6 @@ import { withRouter } from 'react-router'
 import classnames from 'classnames'
 import { translate } from 'react-i18next'
 import WorkspaceListItem from '../component/Sidebar/WorkspaceListItem.jsx'
-import { getWorkspaceList } from '../action-creator.async.js'
 import {
   setWorkspaceListIsOpenInSidebar,
   updateWorkspaceFilter
@@ -20,22 +19,11 @@ class Sidebar extends React.Component {
     }
   }
 
-  componentDidMount () {
-    const { workspaceIdInUrl } = this.state
-    const { user, workspaceList, dispatch } = this.props
-
-    user.id !== -1 && workspaceList.length === 0 && dispatch(getWorkspaceList(user.id, workspaceIdInUrl))
-  }
-
   componentDidUpdate (prevProps, prevState) {
-    const { user, match, dispatch } = this.props
-
-    if (this.state.workspaceIdInUrl === null) return
-
-    const newWorkspaceId = parseInt(match.params.idws)
-    prevState.workspaceIdInUrl !== newWorkspaceId && this.setState({workspaceIdInUrl: newWorkspaceId})
+    if (this.props.match.params.idws === undefined) return
 
-    user.id !== -1 && prevProps.user.id !== user.id && dispatch(getWorkspaceList(user.id, newWorkspaceId))
+    const newWorkspaceId = parseInt(this.props.match.params.idws)
+    if (prevState.workspaceIdInUrl !== newWorkspaceId) this.setState({workspaceIdInUrl: newWorkspaceId})
   }
 
   handleClickWorkspace = (idWs, newIsOpenInSidebar) => this.props.dispatch(setWorkspaceListIsOpenInSidebar(idWs, newIsOpenInSidebar))

src/container/Tracim.jsx

@@ -58,9 +58,9 @@ class Tracim extends React.Component {
               <Route path={PAGE.LOGIN} component={Login} />
 
               <PrivateRoute exact path={PAGE.HOME} component={WorkspaceContent} />
+              <PrivateRoute path={PAGE.ACCOUNT} component={Account} />
               {/* bellow, the '?' is important, it avoid to have to declare another route for CONTENT_LIST which could double match */}
               <PrivateRoute path={PAGE.WORKSPACE.CONTENT(':idws', ':idcts?')} component={WorkspaceContent} />
-              <PrivateRoute path={PAGE.ACCOUNT} component={Account} />
               <PrivateRoute exact path={PAGE.WORKSPACE.DASHBOARD()} component={Dashboard} />
               <PrivateRoute path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
 

src/container/WorkspaceContent.jsx

@@ -14,11 +14,14 @@ import PopupCreateContent from '../component/PopupCreateContent/PopupCreateConta
 import {
   getAppList,
   getWorkspaceContent,
-  getFolderContent
+  getFolderContent,
+  getWorkspaceList
 } from '../action-creator.async.js'
 import {
   newFlashMessage,
-  setWorkspaceData
+  setWorkspaceData,
+  setWorkspaceListIsOpenInSidebar,
+  updateWorkspaceListData
 } from '../action-creator.sync.js'
 
 const qs = require('query-string')
@@ -31,18 +34,32 @@ class WorkspaceContent extends React.Component {
         display: false,
         type: undefined,
         folder: undefined
-      }
+      },
+      workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null
     }
   }
 
   async componentDidMount () {
-    const { workspaceList, app, match, location, dispatch } = this.props
+    const { workspaceIdInUrl } = this.state
+    const { user, workspaceList, app, match, location, dispatch } = this.props
 
     if (Object.keys(app).length === 0) dispatch(getAppList()) // async but no need await
 
     let wsToLoad = null
     if (match.params.idws !== undefined) wsToLoad = match.params.idws
-    else if (workspaceList.length > 0) wsToLoad = workspaceList[0].id // load first ws if none specified
+
+    if (user.user_id !== -1 && workspaceList.length === 0) {
+      const fetchGetWorkspaceList = await dispatch(getWorkspaceList(user.user_id))
+
+      if (fetchGetWorkspaceList.status === 200) {
+        dispatch(updateWorkspaceListData(fetchGetWorkspaceList.json))
+        dispatch(setWorkspaceListIsOpenInSidebar(workspaceIdInUrl || fetchGetWorkspaceList.json[0].id, true))
+
+        if (match.params.idws === undefined && fetchGetWorkspaceList.json.length > 0) {
+          wsToLoad = fetchGetWorkspaceList.json[0].id // load first ws if none specified
+        }
+      }
+    }
 
     if (wsToLoad === null) return // ws already loaded
 
@@ -59,6 +76,17 @@ class WorkspaceContent extends React.Component {
     } else dispatch(newFlashMessage('Error while loading workspace', 'danger'))
   }
 
+  componentDidUpdate (prevProps, prevState) {
+    const { user, match, dispatch } = this.props
+
+    if (this.state.workspaceIdInUrl === null) return
+
+    const newWorkspaceId = parseInt(match.params.idws)
+    prevState.workspaceIdInUrl !== newWorkspaceId && this.setState({workspaceIdInUrl: newWorkspaceId})
+
+    if (user.id !== -1 && prevProps.user.id !== user.id) dispatch(getWorkspaceList(user.user_id, newWorkspaceId))
+  }
+
   handleClickContentItem = content => {
     this.props.history.push(`${PAGE.WORKSPACE.CONTENT(content.workspace_id, content.id)}${this.props.location.search}`)
     this.props.renderApp(this.props.app[content.type], this.props.user, {...content, workspace: this.props.workspace})
@@ -115,7 +143,7 @@ class WorkspaceContent extends React.Component {
     const filterWorkspaceContent = (contentList, filter) => filter.length === 0
       ? contentList
       : contentList.filter(c => c.type === 'folder' || filter.includes(c.type)) // keep unfiltered files and folders
-        .map(c => c.type !== 'folder' ? c : {...c, content: this.filterWorkspaceContent(c.content, filter)}) // recursively filter folder content
+        .map(c => c.type !== 'folder' ? c : {...c, content: filterWorkspaceContent(c.content, filter)}) // recursively filter folder content
     // .filter(c => c.type !== 'folder' || c.content.length > 0) // remove empty folder => 2018/05/21 - since we load only one lvl of content, don't remove empty folders
 
     const filteredWorkspaceContent = filterWorkspaceContent(workspace.content, workspace.filter)