Browse Source

added colored debug msg + fixed double event sometimes emited + edit title now refresh tracim front content list

Skylsmoi 6 years ago
parent
commit
34ffecc9cc
2 changed files with 21 additions and 5 deletions
  1. 17 5
      src/container/HtmlDocument.jsx
  2. 4 0
      src/container/PopupCreateHtmlDocument.jsx

+ 17 - 5
src/container/HtmlDocument.jsx View File

43
   customEventReducer = ({ detail: { type, data } }) => { // action: { type: '', data: {} }
43
   customEventReducer = ({ detail: { type, data } }) => { // action: { type: '', data: {} }
44
     switch (type) {
44
     switch (type) {
45
       case 'html-documents_showApp':
45
       case 'html-documents_showApp':
46
+        console.log('%c<HtmlDocument> Custom event', 'color: #28a745', type, data)
46
         this.setState({isVisible: true})
47
         this.setState({isVisible: true})
47
         break
48
         break
48
       case 'html-documents_hideApp':
49
       case 'html-documents_hideApp':
50
+        console.log('%c<HtmlDocument> Custom event', 'color: #28a745', type, data)
49
         this.setState({isVisible: false})
51
         this.setState({isVisible: false})
50
         break
52
         break
51
       case 'html-documents_reloadContent':
53
       case 'html-documents_reloadContent':
54
+        console.log('%c<HtmlDocument> Custom event', 'color: #28a745', type, data)
52
         this.setState(prev => ({content: {...prev.content, ...data}, isVisible: true}))
55
         this.setState(prev => ({content: {...prev.content, ...data}, isVisible: true}))
53
     }
56
     }
54
   }
57
   }
55
 
58
 
56
   componentDidMount () {
59
   componentDidMount () {
57
-    console.log('HtmlDocument did mount')
60
+    console.log('%c<HtmlDocument> did mount', `color: ${this.state.config.hexcolor}`)
58
 
61
 
59
     this.loadContent()
62
     this.loadContent()
60
   }
63
   }
62
   componentDidUpdate (prevProps, prevState) {
65
   componentDidUpdate (prevProps, prevState) {
63
     const { state } = this
66
     const { state } = this
64
 
67
 
65
-    console.log('HtmlDocument did update', prevState, state)
68
+    console.log('%c<HtmlDocument> did update', `color: ${this.state.config.hexcolor}`, prevState, state)
69
+
66
     if (!prevState.content || !state.content) return
70
     if (!prevState.content || !state.content) return
67
 
71
 
68
     if (prevState.content.content_id !== state.content.content_id) this.loadContent()
72
     if (prevState.content.content_id !== state.content.content_id) this.loadContent()
73
     else if (prevState.timelineWysiwyg && !state.timelineWysiwyg) tinymce.remove('#wysiwygTimelineComment')
77
     else if (prevState.timelineWysiwyg && !state.timelineWysiwyg) tinymce.remove('#wysiwygTimelineComment')
74
   }
78
   }
75
 
79
 
80
+  componentWillUnmount () {
81
+    console.log('%c<HtmlDocument> will Unmount', `color: ${this.state.config.hexcolor}`)
82
+    document.removeEventListener('appCustomEvent', this.customEventReducer)
83
+  }
84
+
76
   loadContent = async () => {
85
   loadContent = async () => {
77
     const { loggedUser, content, config } = this.state
86
     const { loggedUser, content, config } = this.state
78
 
87
 
132
 
141
 
133
     handleFetchResult(await fetchResultSaveHtmlDoc)
142
     handleFetchResult(await fetchResultSaveHtmlDoc)
134
       .then(resSave => {
143
       .then(resSave => {
135
-        if (resSave.apiResponse.status === 200) this.loadContent()
136
-        else console.warn('Error saving html-document. Result:', resSave, 'content:', content, 'config:', config)
144
+        if (resSave.apiResponse.status === 200) {
145
+          this.loadContent()
146
+          GLOBAL_dispatchEvent({ type: 'refreshContentList', data: {} })
147
+        } else {
148
+          console.warn('Error saving html-document. Result:', resSave, 'content:', content, 'config:', config)
149
+        }
137
       })
150
       })
138
   }
151
   }
139
 
152
 
224
   }
237
   }
225
 
238
 
226
   handleClickShowRevision = revision => {
239
   handleClickShowRevision = revision => {
227
-    console.log('revision', revision)
228
     this.setState(prev => ({
240
     this.setState(prev => ({
229
       content: {
241
       content: {
230
         ...prev.content,
242
         ...prev.content,

+ 4 - 0
src/container/PopupCreateHtmlDocument.jsx View File

65
           this.handleClose()
65
           this.handleClose()
66
 
66
 
67
           GLOBAL_dispatchEvent({
67
           GLOBAL_dispatchEvent({
68
+            type: 'refreshContentList'
69
+          })
70
+
71
+          GLOBAL_dispatchEvent({
68
             type: 'openContentUrl', // handled by tracim_front:src/container/WorkspaceContent.jsx
72
             type: 'openContentUrl', // handled by tracim_front:src/container/WorkspaceContent.jsx
69
             data: {
73
             data: {
70
               idWorkspace: resSave.body.workspace_id,
74
               idWorkspace: resSave.body.workspace_id,