preparation for App opening in workspaceContent

src/container/WorkspaceContent.jsx

@@ -15,7 +15,7 @@ import {
   getAppList,
   getContentTypeList,
   getWorkspaceContentList,
-  getWorkspaceContent,
+  // getWorkspaceContent,
   getFolderContent,
   getWorkspaceList
 } from '../action-creator.async.js'
@@ -39,7 +39,8 @@ class WorkspaceContent extends React.Component {
         type: undefined,
         folder: undefined
       },
-      workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null
+      workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null,
+      workspaceOpened: false
     }
 
     document.addEventListener('appCustomEvent', this.customEventReducer)
@@ -52,6 +53,7 @@ class WorkspaceContent extends React.Component {
         break
       case 'appClosed':
         this.props.history.push(PAGE.WORKSPACE.CONTENT(this.props.workspace.id, ''))
+        this.setState({workspaceOpened: false})
         break
     }
   }
@@ -72,7 +74,6 @@ class WorkspaceContent extends React.Component {
       if (fetchGetContentTypeList.status === 200) dispatch(setContentTypeList(fetchGetContentTypeList.json))
     }
 
-
     let wsToLoad = null
     if (match.params.idws !== undefined) wsToLoad = match.params.idws
 
@@ -98,7 +99,7 @@ class WorkspaceContent extends React.Component {
   }
 
   componentDidUpdate (prevProps, prevState) {
-    const { contentType, workspace, user, renderApp, match } = this.props
+    const { contentType, workspaceContent, user, renderApp, match } = this.props
 
     console.log('componentDidUpdate')
 
@@ -109,9 +110,9 @@ class WorkspaceContent extends React.Component {
 
     // if (user.user_id !== -1 && prevProps.user.id !== user.id) dispatch(getWorkspaceList(user.user_id, idWorkspace))
 
-    if (match.params.idcts && workspace.id !== -1) { // if a content id is in url, open it
+    if (match.params.idcts && workspaceContent.id !== -1 && !workspaceOpened && workspaceContent.length) { // if a content id is in url, open it
       const idContentToOpen = parseInt(match.params.idcts)
-      const contentToOpen = workspace.find(wsc => wsc.id === idContentToOpen) // || await dispatch(getWorkspaceContent(idWorkspace, idContentToOpen))
+      const contentToOpen = workspaceContent.find(wsc => wsc.id === idContentToOpen) // || await dispatch(getWorkspaceContent(idWorkspace, idContentToOpen))
 
       // @FIXME : for alpha, we do not handle subfolder. commented code bellow should load a component that is not in the workspace root
       // if (contentToOpen === undefined) { // content is not is ws root
@@ -119,17 +120,20 @@ class WorkspaceContent extends React.Component {
       //   console.log(fetchContent)
       // }
 
+      console.log('contentToOpen', contentToOpen)
+
       renderApp(
         contentType.find(ct => ct.type === contentToOpen.type),
         user,
-        {...contentToOpen, workspace: workspace}
+        {...contentToOpen, workspaceContent: workspaceContent}
       )
+      this.setState({workspaceOpened: true})
     }
   }
 
   handleClickContentItem = content => {
     console.log('content clicked', content)
-    this.props.history.push(`${PAGE.WORKSPACE.CONTENT(content.workspace_id, content.id)}${this.props.location.search}`)
+    this.props.history.push(`${PAGE.WORKSPACE.CONTENT(content.workspaceId, content.id)}${this.props.location.search}`)
   }
 
   handleClickEditContentItem = (e, content) => {
@@ -166,22 +170,22 @@ class WorkspaceContent extends React.Component {
   }
 
   render () {
-    const { workspace, app, contentType } = this.props
+    const { workspaceContent, app, contentType } = this.props
 
     const filterWorkspaceContent = (contentList, filter) => {
       console.log(contentList, filter)
       return filter.length === 0
         ? contentList
         : contentList.filter(c => c.type === 'folder' || filter.includes(c.type)) // keep unfiltered files and folders
-          // @FIXME we need to filter subfolder too, but right now, we dont handle subfolder
-          // .map(c => c.type !== 'folder' ? c : {...c, content: filterWorkspaceContent(c.content, filter)}) // recursively filter folder content
+      // @FIXME we need to filter subfolder too, but right now, we dont handle subfolder
+      // .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
 
     const urlFilter = qs.parse(this.props.location.search).type
 
-    const filteredWorkspaceContent = workspace.length > 0
-      ? filterWorkspaceContent(workspace, urlFilter ? [urlFilter] : [])
+    const filteredWorkspaceContent = workspaceContent.length > 0
+      ? filterWorkspaceContent(workspaceContent, urlFilter ? [urlFilter] : [])
       : []
     console.log('workspaceContent => filteredWorkspaceContent', filteredWorkspaceContent)
 
@@ -193,7 +197,7 @@ class WorkspaceContent extends React.Component {
           <PageTitle
             parentClass='workspace__header'
             customClass='justify-content-between'
-            title={workspace.label ? workspace.label : ''}
+            title={workspaceContent.label ? workspaceContent.label : ''}
           >
             <DropdownCreateButton parentClass='workspace__header__btnaddworkspace' />
           </PageTitle>
@@ -256,5 +260,5 @@ class WorkspaceContent extends React.Component {
   }
 }
 
-const mapStateToProps = ({ user, workspace, workspaceList, app, contentType }) => ({ user, workspace, workspaceList, app, contentType })
+const mapStateToProps = ({ user, workspaceContent, workspaceList, app, contentType }) => ({ user, workspaceContent, workspaceList, app, contentType })
 export default withRouter(connect(mapStateToProps)(appFactory(WorkspaceContent)))

src/reducer/root.js

@@ -2,12 +2,12 @@ import { combineReducers } from 'redux'
 import lang from './lang.js'
 import flashMessage from './flashMessage.js'
 import user from './user.js'
-import workspace from './workspace.js'
+import workspaceContent from './workspaceContent.js'
 import workspaceList from './workspaceList.js'
 import app from './app.js'
 import contentType from './contentType.js'
 import timezone from './timezone.js'
 
-const rootReducer = combineReducers({ lang, flashMessage, user, workspace, workspaceList, app, contentType, timezone })
+const rootReducer = combineReducers({ lang, flashMessage, user, workspaceContent, workspaceList, app, contentType, timezone })
 
 export default rootReducer

src/reducer/workspace.js → src/reducer/workspaceContent.js

@@ -15,12 +15,12 @@ export default function workspace (state = [], action) {
         isArchived: wsc.is_archived,
         parentId: wsc.parent_id,
         isDeleted: wsc.is_deleted,
-        // show_in_ui: wsc.show_in_ui, ???
+        showInUi: wsc.show_in_ui,
         statusSlug: wsc.status_slug,
-        subContentTypeSlug: wsc.sub_content_type_slug,
+        subContentTypeSlug: wsc.sub_content_type_slug
       }))
 
-    case `Update/${WORKSPACE}/Filter`:
+    case `Update/${WORKSPACE}/Filter`: // not used anymore ?
       return {...state, filter: action.filterList}
 
     case `Set/${WORKSPACE}/${FOLDER}/Content`: