added feature create new workspace

build_full_frontend.sh

@@ -53,6 +53,24 @@ log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_trans
 cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json
 cd -
 
+# app Workspace
+
+log "cd frontend_app_workspace"
+cd frontend_app_workspace
+
+log "npm run build$windoz # for frontend_app_workspace"
+npm run build$windoz
+
+log "cp dist/workspace.app.js"
+cp dist/workspace.app.js ../frontend/dist/app
+
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/workspace_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/workspace_en_translation.json
+
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/workspace_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/workspace_fr_translation.json
+cd -
+
 # app Admin Workspace User
 
 log "cd frontend_app_admin_workspace_user"

frontend/dist/appInterface.js

@@ -3,6 +3,8 @@
 
   getSelectedApp = name => {
     switch (name) {
+      case 'workspace':
+        return appWorkspace
       case 'html-document':
         return appHtmlDocument
       case 'thread':

frontend/dist/index.html

@@ -51,6 +51,7 @@
     <script src='/tracim.vendor.bundle.js'></script>
     <script src='/tracim.app.entry.js'></script>
 
+    <script src='/app/workspace.app.js'></script>
     <script src='/app/html-document.app.js'></script>
     <script src='/app/thread.app.js'></script>
     <!-- <script src='/app/file.app.js'></script> -->

frontend/src/container/Sidebar.jsx

@@ -3,6 +3,7 @@ import { connect } from 'react-redux'
 import { withRouter } from 'react-router'
 import classnames from 'classnames'
 import { translate } from 'react-i18next'
+import appFactory from '../appFactory.js'
 import WorkspaceListItem from '../component/Sidebar/WorkspaceListItem.jsx'
 import {
   setWorkspaceListIsOpenInSidebar,
@@ -12,7 +13,7 @@ import {
 import {
   getWorkspaceList
 } from '../action-creator.async.js'
-import { PAGE } from '../helper.js'
+import { PAGE, workspaceConfig } from '../helper.js'
 
 const qs = require('query-string')
 
@@ -23,22 +24,23 @@ class Sidebar extends React.Component {
       sidebarClose: false,
       workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null
     }
-  }
-
-  async componentDidMount () {
-    const { workspaceIdInUrl } = this.state
-    const { user, workspaceList, dispatch } = this.props
 
-    if (user.user_id !== -1 && workspaceList.length === 0) {
-      const fetchGetWorkspaceList = await dispatch(getWorkspaceList(user))
+    document.addEventListener('appCustomEvent', this.customEventReducer)
+  }
 
-      if (fetchGetWorkspaceList.status === 200) {
-        dispatch(updateWorkspaceListData(fetchGetWorkspaceList.json))
-        dispatch(setWorkspaceListIsOpenInSidebar(workspaceIdInUrl || fetchGetWorkspaceList.json[0].workspace_id, true))
-      }
+  customEventReducer = async ({ detail: { type, data } }) => {
+    switch (type) {
+      case 'refreshWorkspaceList':
+        console.log('%c<Sidebar> Custom event', 'color: #28a745', type, data)
+        this.loadWorkspaceList()
+        break
     }
   }
 
+  componentDidMount () {
+    this.loadWorkspaceList()
+  }
+
   componentDidUpdate (prevProps, prevState) {
     // console.log('%c<Sidebar> Did Update', 'color: #c17838')
     if (this.props.match.params.idws === undefined || isNaN(this.props.match.params.idws)) return
@@ -47,6 +49,20 @@ class Sidebar extends React.Component {
     if (prevState.workspaceIdInUrl !== newWorkspaceId) this.setState({workspaceIdInUrl: newWorkspaceId})
   }
 
+  loadWorkspaceList = async () => {
+    const { workspaceIdInUrl } = this.state
+    const { user, dispatch } = this.props
+
+    if (user.user_id !== -1) {
+      const fetchGetWorkspaceList = await dispatch(getWorkspaceList(user))
+
+      if (fetchGetWorkspaceList.status === 200) {
+        dispatch(updateWorkspaceListData(fetchGetWorkspaceList.json))
+        dispatch(setWorkspaceListIsOpenInSidebar(workspaceIdInUrl || fetchGetWorkspaceList.json[0].workspace_id, true))
+      }
+    }
+  }
+
   handleClickWorkspace = (idWs, newIsOpenInSidebar) => this.props.dispatch(setWorkspaceListIsOpenInSidebar(idWs, newIsOpenInSidebar))
 
   handleClickAllContent = idWs => {
@@ -70,6 +86,8 @@ class Sidebar extends React.Component {
 
   handleClickToggleSidebar = () => this.setState(prev => ({sidebarClose: !prev.sidebarClose}))
 
+  handleClickNewWorkspace = () => this.props.renderAppPopupCreation(workspaceConfig, this.props.user, null, null)
+
   render () {
     const { sidebarClose, workspaceIdInUrl } = this.state
     const { activeLang, workspaceList, t } = this.props
@@ -103,7 +121,10 @@ class Sidebar extends React.Component {
             </nav>
 
             <div className='sidebar__btnnewworkspace'>
-              <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
+              <button
+                className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'
+                onClick={this.handleClickNewWorkspace}
+              >
                 {t('Create a workspace')}
               </button>
             </div>
@@ -130,4 +151,4 @@ const mapStateToProps = ({ lang, user, workspace, workspaceList }) => ({
   workspace,
   workspaceList
 })
-export default withRouter(connect(mapStateToProps)(translate()(Sidebar)))
+export default withRouter(connect(mapStateToProps)(appFactory(translate()(Sidebar))))

frontend/src/container/Tracim.jsx

@@ -28,6 +28,21 @@ import {
 import Cookies from 'js-cookie'
 
 class Tracim extends React.Component {
+  constructor (props) {
+    super(props)
+
+    document.addEventListener('appCustomEvent', this.customEventReducer)
+  }
+
+  customEventReducer = async ({ detail: { type, data } }) => {
+    switch (type) {
+      case 'redirect':
+        console.log('%c<Tracim> Custom event', 'color: #28a745', type, data)
+        this.props.history.push(data.url)
+        break
+    }
+  }
+
   async componentDidMount () {
     const { dispatch } = this.props
 

frontend/src/helper.js

@@ -12,6 +12,15 @@ export const COOKIE = {
   USER_AUTH: 'user_auth'
 }
 
+// Côme - 2018/08/02 - shouldn't this come from api ?
+export const workspaceConfig = {
+  slug: 'workspace',
+  faIcon: 'space-shuttle',
+  hexcolor: '#7d4e24',
+  creationLabel: 'Create a workspace',
+  domContainer: 'appFeatureContainer'
+}
+
 export const PAGE = {
   HOME: '/',
   WORKSPACE: {

frontend_app_workspace/src/container/PopupCreateWorkspace.jsx

@@ -10,7 +10,6 @@ import i18n from '../i18n.js'
 
 const debug = { // outdated
   config: {
-    // label: 'New Document',
     slug: 'workspace',
     faIcon: 'space-shuttle',
     hexcolor: '#7d4e24',
@@ -83,7 +82,7 @@ class PopupCreateWorkspace extends React.Component {
   handleValidate = async () => {
     const { loggedUser, config, newWorkspaceName } = this.state
 
-    const fetchSaveNewWorkspace = postWorkspace(loggedUser, config.apiUrl, config.slug, newWorkspaceName)
+    const fetchSaveNewWorkspace = postWorkspace(loggedUser, config.apiUrl, newWorkspaceName)
 
     handleFetchResult(await fetchSaveNewWorkspace)
       .then(resSave => {
@@ -95,7 +94,7 @@ class PopupCreateWorkspace extends React.Component {
           GLOBAL_dispatchEvent({
             type: 'redirect',
             data: {
-              url: `/workspaces/${resSave.json.workspace_id}`
+              url: `/workspaces/${resSave.body.workspace_id}/dashboard`
             }
           })
         }

frontend_app_workspace/webpack.config.js

@@ -12,7 +12,7 @@ module.exports = {
     path: path.resolve(__dirname, 'dist'),
     filename: isProduction ? 'workspace.app.js' : 'workspace.app.dev.js',
     pathinfo: !isProduction,
-    library: isProduction ? 'workspace' : undefined,
+    library: isProduction ? 'appWorkspace' : undefined,
     libraryTarget: isProduction ? 'var' : undefined
   },
   externals: {},

frontend_lib/src/component/CardPopup/CardPopupCreateContent.jsx

@@ -27,7 +27,7 @@ const PopupCreateContent = props => {
           <input
             type='text'
             className='createcontent__form__input'
-            placeHolder={props.inputPlaceholder}
+            placeholder={props.inputPlaceholder}
             value={props.contentName}
             onChange={props.onChangeContentName}
           />