Merge branch 'develop' of github.com:tracim/tracim_front into develop

dist/index.html

@@ -65,6 +65,13 @@
       GLOBAL_renderCreateContentApp = app => {
         console.log('%cGLOBAL_renderCreateContentApp', 'color: #5cebeb', app)
 
+        const selectedApp = getSelectedApp(app.config.slug)
+
+        if (!selectedApp) {
+          console.log('Error in GLOBAL_renderCreateContentApp, selectedApp is undefined', app)
+          return
+        }
+
         getSelectedApp(app.config.slug).renderPopupCreation(app)
       }
 

src/container/OpenContentApp.jsx → src/component/Workspace/OpenContentApp.jsx

@@ -1,15 +1,15 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import { withRouter } from 'react-router'
-import appFactory from '../appFactory.js'
+import appFactory from '../../appFactory.js'
 
 export class OpenContentApp extends React.Component {
   openContentApp = () => {
     const { idWorkspace, appOpenedType, user, workspaceContent, contentType, renderApp, match } = this.props
 
-    if (isNaN(idWorkspace)) return
+    if (isNaN(idWorkspace) || idWorkspace === -1) return
 
-    if (['type', 'idcts'].every(p => p in match.params) && match.params.type !== 'contents' && workspaceContent.id !== -1 && workspaceContent.length) {
+    if (['type', 'idcts'].every(p => p in match.params) && match.params.type !== 'contents' && workspaceContent.length) {
       if (isNaN(match.params.idcts) || !contentType.map(c => c.slug).includes(match.params.type)) return
 
       const contentToOpen = {

src/component/Workspace/OpenCreateContentApp.jsx

@@ -0,0 +1,42 @@
+import React from 'react'
+import { connect } from 'react-redux'
+import { withRouter } from 'react-router'
+import appFactory from '../../appFactory.js'
+
+const qs = require('query-string')
+
+export class OpenCreateContentApp extends React.Component {
+  openCreateContentApp = () => {
+    const { idWorkspace, appOpenedType, user, contentType, renderCreateContentApp, match, location } = this.props
+
+    if (isNaN(idWorkspace) || idWorkspace === -1) return
+
+    if (['idws', 'type'].every(p => p in match.params) && contentType.map(c => c.slug).includes(match.params.type)) {
+      renderCreateContentApp(
+        contentType.find(ct => ct.slug === match.params.type),
+        user,
+        idWorkspace,
+        qs.parse(location.search).parent_id
+      )
+    }
+  }
+
+  componentDidMount () {
+    console.log('%c<OpenCreateContentApp> did Mount', 'color: #dcae84', this.props)
+
+    this.openCreateContentApp()
+  }
+
+  componentDidUpdate () {
+    console.log('%c<OpenCreateContentApp> did Update', 'color: #dcae84', this.props)
+
+    this.openCreateContentApp()
+  }
+
+  render () {
+    return null
+  }
+}
+
+const mapStateToProps = ({ user, workspaceContent, contentType }) => ({ user, workspaceContent, contentType })
+export default withRouter(connect(mapStateToProps)(appFactory(OpenCreateContentApp)))

src/component/common/Input/DropdownCreateButton.jsx

@@ -24,7 +24,7 @@ const DropdownCreateButton = props => {
         aria-labelledby='dropdownCreateBtn'
       >
         <SubDropdownCreateButton
-          idFolder={null}
+          idFolder={props.idFolder}
           availableApp={props.availableApp}
           onClickCreateContent={props.onClickCreateContent}
         />

src/container/WorkspaceContent.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { withRouter } from 'react-router-dom'
+import { withRouter, Route } from 'react-router-dom'
 import appFactory from '../appFactory.js'
 import { PAGE } from '../helper.js'
 import Sidebar from './Sidebar.jsx'
@@ -11,7 +11,8 @@ import PageWrapper from '../component/common/layout/PageWrapper.jsx'
 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 OpenContentApp from './OpenContentApp.jsx'
+import OpenContentApp from '../component/Workspace/OpenContentApp.jsx'
+import OpenCreateContentApp from '../component/Workspace/OpenCreateContentApp.jsx'
 import {
   getAppList,
   getContentTypeList,
@@ -59,6 +60,7 @@ class WorkspaceContent extends React.Component {
         break
 
       case 'appClosed':
+      case 'hide_popupCreateContent':
         console.log('%c<WorkspaceContent> Custom event', 'color: #28a745', type, data, this.state.workspaceIdInUrl)
         this.props.history.push(PAGE.WORKSPACE.CONTENT_LIST(this.state.workspaceIdInUrl))
         this.setState({appOpenedType: false})
@@ -173,12 +175,7 @@ class WorkspaceContent extends React.Component {
 
   handleClickCreateContent = (e, idFolder, contentType) => {
     e.stopPropagation()
-    this.props.renderCreateContentApp(
-      this.props.contentType.find(ct => ct.slug === contentType),
-      this.props.user,
-      this.props.match.params.idws,
-      idFolder
-    )
+    this.props.history.push(`${PAGE.WORKSPACE.NEW(this.state.workspaceIdInUrl, contentType, idFolder)}?parent_id=${idFolder}`)
   }
 
   handleUpdateAppOpenedType = openedAppType => this.setState({appOpenedType: openedAppType})
@@ -206,11 +203,20 @@ class WorkspaceContent extends React.Component {
         <Sidebar />
 
         <OpenContentApp
+          // automatically open the app for the idContent in url
           idWorkspace={this.state.workspaceIdInUrl}
           appOpenedType={this.state.appOpenedType}
           updateAppOpenedType={this.handleUpdateAppOpenedType}
         />
 
+        <Route path={PAGE.WORKSPACE.NEW(':idws', ':type')} component={() =>
+          <OpenCreateContentApp
+            // automatically open the popup create content of the app in url
+            idWorkspace={this.state.workspaceIdInUrl}
+            appOpenedType={this.state.appOpenedType}
+          />
+        } />
+
         <PageWrapper customeClass='workspace'>
           <PageTitle
             parentClass='workspace__header'
@@ -219,7 +225,7 @@ class WorkspaceContent extends React.Component {
           >
             <DropdownCreateButton
               parentClass='workspace__header__btnaddworkspace'
-              idFolder={null}
+              idFolder={null} // null because it is workspace root content
               onClickCreateContent={this.handleClickCreateContent}
               availableApp={contentType}
             />

src/helper.js

@@ -16,7 +16,7 @@ export const PAGE = {
   HOME: '/',
   WORKSPACE: {
     DASHBOARD: (idws = ':idws') => `/workspaces/${idws}/dashboard`,
-    NEW: '/workspaces/new',
+    NEW: (idws, type) => `/workspaces/${idws}/${type}/new`,
     CALENDAR: (idws = ':idws') => `/workspaces/${idws}/calendar`,
     CONTENT_LIST: (idws = ':idws') => `/workspaces/${idws}/contents`,
     CONTENT: (idws = ':idws', type = ':type?', idcts = ':idcts?') => `/workspaces/${idws}/${type}/${idcts}`,