Route are now declared in a safer way

src/container/Tracim.jsx

@@ -58,10 +58,10 @@ class Tracim extends React.Component {
               <Route path={PAGE.LOGIN} component={Login} />
 
               <PrivateRoute exact path={PAGE.HOME} component={WorkspaceContent} />
-              <PrivateRoute exact path={PAGE.WORKSPACE.CONTENT_LIST(':idws')} component={WorkspaceContent} /> {/* "exact" here to not double match Route WORKSPACE.CONTENT */}
-              <PrivateRoute path={PAGE.WORKSPACE.CONTENT(':idws', ':idcts')} component={WorkspaceContent} />
+              {/* 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 path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
+              <PrivateRoute path={PAGE.WORKSPACE.DASHBOARD()} component={Dashboard} />
               <PrivateRoute path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
 
               <Footer />

src/container/WorkspaceContent.jsx

@@ -21,6 +21,7 @@ const qs = require('query-string')
 
 class WorkspaceContent extends React.Component {
   async componentDidMount () {
+    console.log('WorkspaceContent did mount')
     const { workspaceList, app, match, location, dispatch } = this.props
 
     if (Object.keys(app).length === 0) await dispatch(getAppList())

src/helper.js

@@ -10,15 +10,15 @@ export const FETCH_CONFIG = {
 export const PAGE = {
   HOME: '/',
   WORKSPACE: {
-    DASHBOARD: idws => `/workspace/${idws}`,
+    DASHBOARD: (idws = 'idws') => `/workspace/${idws}`,
     NEW: '/workspace/new',
-    CALENDAR: idws => `/workspace/${idws}/apps/calendar`,
-    CONTENT_LIST: idws => `/workspace/${idws}/apps/contents`,
-    CONTENT: (idws, idcts) => `/workspace/${idws}/apps/contents/${idcts}`,
-    CONTENT_NEW: (idws, ctstype) => `/workspace/${idws}/apps/contents/${ctstype}/new`,
-    CONTENT_EDIT: (idws, idcts) => `/workspace/${idws}/apps/contents/${idcts}/edit`,
-    CONTENT_TITLE_EDIT: (idws, idcts) => `/workspace/${idws}/apps/contents/${idcts}/title/edit`,
-    ADMIN: idws => `/workspace/${idws}/admin`
+    CALENDAR: (idws = ':idws') => `/workspace/${idws}/apps/calendar`,
+    CONTENT_LIST: (idws = ':idws') => `/workspace/${idws}/apps/contents`,
+    CONTENT: (idws = ':idws', idcts = ':idcts') => `/workspace/${idws}/apps/contents/${idcts}`,
+    CONTENT_NEW: (idws = ':idws', ctstype = ':ctstype') => `/workspace/${idws}/apps/contents/${ctstype}/new`,
+    CONTENT_EDIT: (idws = ':idws', idcts = ':idcts') => `/workspace/${idws}/apps/contents/${idcts}/edit`,
+    CONTENT_TITLE_EDIT: (idws = ':idws', idcts = ':idcts') => `/workspace/${idws}/apps/contents/${idcts}/title/edit`,
+    ADMIN: (idws = ':idws') => `/workspace/${idws}/admin`
   },
   LOGIN: '/login',
   ACCOUNT: '/account'