added translation + fixed WorkspaceContent async call

jsonserver/server.js

@@ -1,7 +1,7 @@
 const jsonServer = require('json-server')
 const jsonDb = require('./static_db.json')
 const server = jsonServer.create()
-const router = jsonServer.router() // for persistance : jsonServer.router('static_db.json')
+const router = jsonServer.router() // for persistence : jsonServer.router('static_db.json')
 const middlewares = jsonServer.defaults()
 const GLOBAL_PORT = 3001
 

src/action-creator.sync.js

@@ -13,8 +13,8 @@ export const updateWorkspaceListData = workspaceList => ({ type: `Update/${WORKS
 export const setWorkspaceListIsOpen = (workspaceId, isOpen) => ({ type: `Set/${WORKSPACE_LIST}/isOpen`, workspaceId, isOpen })
 
 export const FILE_CONTENT = 'FileContent'
-export const setActiveFileContent = file => ({ type: `Set/${FILE_CONTENT}/Active`, file })
-export const hideActiveFileContent = () => ({ type: `Set/${FILE_CONTENT}/Hide` })
+export const setActiveFileContentActive = file => ({ type: `Set/${FILE_CONTENT}/Active`, file })
+export const setActiveFileContentHide = () => ({ type: `Set/${FILE_CONTENT}/Hide` })
 
 export const APP_LIST = 'App/List'
 export const setAppList = appList => ({ type: `Set/${APP_LIST}`, appList })

src/app/ContentType/PageHtml/PageHtmlContainer.jsx

@@ -12,12 +12,12 @@ import {
 } from 'tracim_lib'
 import PageHtmlComponent from './PageHtmlComponent.jsx'
 import Timeline from '../../../component/Timeline.jsx'
-import { hideActiveFileContent } from '../../../action-creator.sync.js'
+import { setActiveFileContentHide } from '../../../action-creator.sync.js'
 
 require('./PageHtml.styl')
 
 class PageHtmlContainer extends React.Component {
-  handleClickBtnClose = () => this.props.dispatch(hideActiveFileContent())
+  handleClickBtnClose = () => this.props.dispatch(setActiveFileContentHide())
 
   render () {
     const { activeFileContent, app: { PageHtml } } = this.props

src/component/Footer.jsx

@@ -1,14 +1,15 @@
 import React from 'react'
+import { translate } from 'react-i18next'
 import logoFooter from '../img/logoFooter.svg'
 
-const Footer = props => {
+const Footer = ({ t }) => {
   return (
     <footer className='footer text-right'>
       <div className='footer__text'>
-        Créer votre propre espace de travail collaboratif sur trac.im - Copyright 2013 - 2017
+        {t('Footer.marketing_msg')} - {t('Footer.copyright')}
       </div>
       <img className='footer__logo' src={logoFooter} />
     </footer>
   )
 }
-export default Footer
+export default translate()(Footer)

src/component/Workspace/FileItemHeader.jsx

@@ -6,7 +6,7 @@ const FileItemHeader = props => {
     <div className='file__header'>
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
         <div className='file__header__type'>
-          Type
+          {props.t('FileItemHeader.type')}
         </div>
       </div>
       <div className='col-8 col-sm-8 col-md-8 col-lg-8 col-xl-10'>

src/component/Workspace/Folder.jsx

@@ -44,7 +44,7 @@ class Folder extends React.Component {
           </div>
           <div className='folder__header__contenttype'>
             <div className='folder__header__contenttype__text'>
-              Type de Contenu :
+              {t('Folder.content_type')} :
             </div>
             <div className='folder__header__contenttype__icon'>
               <i className='fa fa-list-ul' />

src/container/WorkspaceContent.jsx

@@ -8,6 +8,7 @@ import PageTitle from '../component/common/layout/PageTitle.jsx'
 import PageContent from '../component/common/layout/PageContent.jsx'
 import DropdownCreateButton from '../component/common/Input/DropdownCreateButton.jsx'
 import { FETCH_CONFIG } from '../helper.js'
+import { setActiveFileContentActive } from '../action-creator.sync.js'
 import {
   getAppList,
   getWorkspaceContent
@@ -31,17 +32,20 @@ class WorkspaceContent extends React.Component {
   }
 
   componentDidUpdate (prevProps) {
-    const { workspaceList, match, dispatch } = this.props
+    const { workspace, workspaceList, match, dispatch } = this.props
 
-    if (prevProps.match.params.idws === match.params.idws) return
+    // if a workspace is already loaded and the idws in url hasn't changed, do nothing
+    if (workspace.id !== -1 && prevProps.match.params.idws === match.params.idws) return
 
+    // if the idws in url has changed, load the new workspace
     if (match.params.idws !== undefined) dispatch(getWorkspaceContent(match.params.idws))
-    // else load first ws if none specified
-    else if (match.params.idws === undefined && workspaceList.length > 0) dispatch(getWorkspaceContent(workspaceList[0].id))
+    // else bellow is for loading url PAGE_NAME.HOME (without an idws), when workspaceList is loaded, load the first workspace
+    else if (match.params.idws === undefined && workspace.id === -1 && workspaceList.length > 0) dispatch(getWorkspaceContent(workspaceList[0].id))
   }
 
   handleClickContentItem = content => {
-    const { user, workspace } = this.props
+    const { user, workspace, dispatch } = this.props
+
     GLOBAL_renderApp({
       workspace: {
         id: workspace.id,
@@ -54,6 +58,8 @@ class WorkspaceContent extends React.Component {
       loggedUser: user.isLoggedIn ? user : {},
       content
     })
+
+    dispatch(setActiveFileContentActive(content))
   }
 
   render () {
@@ -99,5 +105,5 @@ class WorkspaceContent extends React.Component {
   }
 }
 
-const mapStateToProps = ({ user, workspace, workspaceList, activeFileContent, app }) => ({ user, workspace, workspaceList, activeFileContent, app })
+const mapStateToProps = ({ user, workspace, workspaceList, app }) => ({ user, workspace, workspaceList, app })
 export default connect(mapStateToProps)(WorkspaceContent)

src/reducer/activeFileContent.js

@@ -8,10 +8,7 @@ export default function activeFileContent (state = {
 }, action) {
   switch (action.type) {
     case `Set/${FILE_CONTENT}/Active`:
-      return {
-        display: true,
-        ...action.file
-      }
+      return {...action.file, display: true}
 
     case `Set/${FILE_CONTENT}/Hide`:
       return {...state, display: false}

src/reducer/workspace.js

@@ -8,7 +8,7 @@ const serializeWorkspace = data => ({
 })
 
 export default function user (state = {
-  id: 0,
+  id: -1,
   title: '',
   ownerId: '',
   content: []

src/translate/en.js

@@ -3,12 +3,18 @@ const en = {
     Header: {
       Search: 'Search'
     },
+    Footer: {
+      marketing_msg: 'Create your own collaborative workspaces on trac.im',
+      copyright: 'Copyright 2013 - 2017'
+    },
     FileItemHeader: {
+      type: 'Type',
       document_name: "Document's name",
       status: 'Status'
     },
     Folder: {
-      create: 'Create'
+      create: 'Create',
+      content_type: 'Content type'
     }
   }
 }

src/translate/fr.js

@@ -3,12 +3,18 @@ const fr = {
     Header: {
       Search: 'Rechercher'
     },
+    Footer: {
+      marketing_msg: 'Créer votre propre espace de travail collaboratif sur trac.im',
+      copyright: 'Copyright 2013 - 2017'
+    },
     FileItemHeader: {
+      type: 'Type',
       document_name: 'Nom du document',
-      status: 'Status'
+      status: 'Statut'
     },
     Folder: {
-      create: 'Créer'
+      create: 'Créer',
+      content_type: 'Type de contenu'
     }
   }
 }