Skylsmoi 5 anni fa
parent
commit
dc5aafa8e0
2 ha cambiato i file con 15 aggiunte e 17 eliminazioni
  1. 14 14
      src/action.async.js
  2. 1 3
      src/container/PopupCreateHtmlDocument.jsx

+ 14 - 14
src/action.async.js Vedi File

3
 export const getHtmlDocContent = (user, apiUrl, idWorkspace, idContent) =>
3
 export const getHtmlDocContent = (user, apiUrl, idWorkspace, idContent) =>
4
   fetch(`${apiUrl}/workspaces/${idWorkspace}/html-documents/${idContent}`, {
4
   fetch(`${apiUrl}/workspaces/${idWorkspace}/html-documents/${idContent}`, {
5
     headers: {
5
     headers: {
6
-      ...FETCH_CONFIG.headers,
7
-      'Authorization': 'Basic ' + user.auth
6
+      'Authorization': 'Basic ' + user.auth,
7
+      ...FETCH_CONFIG.headers
8
     },
8
     },
9
     method: 'GET'
9
     method: 'GET'
10
   })
10
   })
12
 export const getHtmlDocComment = (user, apiUrl, idWorkspace, idContent) =>
12
 export const getHtmlDocComment = (user, apiUrl, idWorkspace, idContent) =>
13
   fetch(`${apiUrl}/workspaces/${idWorkspace}/contents/${idContent}/comments`, {
13
   fetch(`${apiUrl}/workspaces/${idWorkspace}/contents/${idContent}/comments`, {
14
     headers: {
14
     headers: {
15
-      ...FETCH_CONFIG.headers,
16
-      'Authorization': 'Basic ' + user.auth
15
+      'Authorization': 'Basic ' + user.auth,
16
+      ...FETCH_CONFIG.headers
17
     },
17
     },
18
     method: 'GET'
18
     method: 'GET'
19
   })
19
   })
21
 export const getHtmlDocRevision = (user, apiUrl, idWorkspace, idContent) =>
21
 export const getHtmlDocRevision = (user, apiUrl, idWorkspace, idContent) =>
22
   fetch(`${apiUrl}/workspaces/${idWorkspace}/html-documents/${idContent}/revisions`, {
22
   fetch(`${apiUrl}/workspaces/${idWorkspace}/html-documents/${idContent}/revisions`, {
23
     headers: {
23
     headers: {
24
-      ...FETCH_CONFIG.headers,
25
-      'Authorization': 'Basic ' + user.auth
24
+      'Authorization': 'Basic ' + user.auth,
25
+      ...FETCH_CONFIG.headers
26
     },
26
     },
27
     method: 'GET'
27
     method: 'GET'
28
   })
28
   })
30
 export const postHtmlDocNewComment = (user, apiUrl, idWorkspace, idContent, newComment) =>
30
 export const postHtmlDocNewComment = (user, apiUrl, idWorkspace, idContent, newComment) =>
31
   fetch(`${apiUrl}/workspaces/${idWorkspace}/contents/${idContent}/comments`, {
31
   fetch(`${apiUrl}/workspaces/${idWorkspace}/contents/${idContent}/comments`, {
32
     headers: {
32
     headers: {
33
-      ...FETCH_CONFIG.headers,
34
-      'Authorization': 'Basic ' + user.auth
33
+      'Authorization': 'Basic ' + user.auth,
34
+      ...FETCH_CONFIG.headers
35
     },
35
     },
36
     method: 'POST',
36
     method: 'POST',
37
     body: JSON.stringify({
37
     body: JSON.stringify({
42
 export const putHtmlDocContent = (user, apiUrl, idWorkspace, idContent, label, newContent) =>
42
 export const putHtmlDocContent = (user, apiUrl, idWorkspace, idContent, label, newContent) =>
43
   fetch(`${apiUrl}/workspaces/${idWorkspace}/html-documents/${idContent}`, {
43
   fetch(`${apiUrl}/workspaces/${idWorkspace}/html-documents/${idContent}`, {
44
     headers: {
44
     headers: {
45
-      ...FETCH_CONFIG.headers,
46
-      'Authorization': 'Basic ' + user.auth
45
+      'Authorization': 'Basic ' + user.auth,
46
+      ...FETCH_CONFIG.headers
47
     },
47
     },
48
     method: 'PUT',
48
     method: 'PUT',
49
     body: JSON.stringify({
49
     body: JSON.stringify({
55
 export const putHtmlDocStatus = (user, apiUrl, idWorkspace, idContent, newStatus) =>
55
 export const putHtmlDocStatus = (user, apiUrl, idWorkspace, idContent, newStatus) =>
56
   fetch(`${apiUrl}/workspaces/${idWorkspace}/html-documents/${idContent}/status`, {
56
   fetch(`${apiUrl}/workspaces/${idWorkspace}/html-documents/${idContent}/status`, {
57
     headers: {
57
     headers: {
58
-      ...FETCH_CONFIG.headers,
59
-      'Authorization': 'Basic ' + user.auth
58
+      'Authorization': 'Basic ' + user.auth,
59
+      ...FETCH_CONFIG.headers
60
     },
60
     },
61
     method: 'PUT',
61
     method: 'PUT',
62
     body: JSON.stringify({
62
     body: JSON.stringify({
67
 export const postHtmlDocContent = (user, apiUrl, idWorkspace, idFolder, contentType, newContentName) =>
67
 export const postHtmlDocContent = (user, apiUrl, idWorkspace, idFolder, contentType, newContentName) =>
68
   fetch(`${apiUrl}/workspaces/${idWorkspace}/contents`, {
68
   fetch(`${apiUrl}/workspaces/${idWorkspace}/contents`, {
69
     headers: {
69
     headers: {
70
-      ...FETCH_CONFIG.headers,
71
-      'Authorization': 'Basic ' + user.auth
70
+      'Authorization': 'Basic ' + user.auth,
71
+      ...FETCH_CONFIG.headers
72
     },
72
     },
73
     method: 'POST',
73
     method: 'POST',
74
     body: JSON.stringify({
74
     body: JSON.stringify({

+ 1 - 3
src/container/PopupCreateHtmlDocument.jsx Vedi File

64
         if (resSave.apiResponse.status === 200) {
64
         if (resSave.apiResponse.status === 200) {
65
           this.handleClose()
65
           this.handleClose()
66
 
66
 
67
-          GLOBAL_dispatchEvent({
68
-            type: 'refreshContentList'
69
-          })
67
+          GLOBAL_dispatchEvent({ type: 'refreshContentList', data: {} })
70
 
68
 
71
           GLOBAL_dispatchEvent({
69
           GLOBAL_dispatchEvent({
72
             type: 'openContentUrl', // handled by tracim_front:src/container/WorkspaceContent.jsx
70
             type: 'openContentUrl', // handled by tracim_front:src/container/WorkspaceContent.jsx