修复创建工作空间时如果项目已存在不提示的问题

Author: veedrin

app/dashboard/api/axios.js

@@ -30,7 +30,7 @@ axios.get = (url, overrideHeaders = {}) => {
     }).then(res => {
         return res.json();
     }).catch(err => {
-        notify({ message: err, notifyType: NOTIFY_TYPE.ERROR });
+        notify({ message: String(err), notifyType: NOTIFY_TYPE.ERROR });
     });
 }
 
@@ -41,9 +41,11 @@ axios.post = (url, data, overrideHeaders = {}) => {
         headers: { ...headers, ...overrideHeaders },
         body: parseFormdata(data),
     }).then(res => {
-        return res.json();
+        if (res.status !== 204) {
+            return res.json();
+        }
     }).catch(err => {
-        notify({ message: err, notifyType: NOTIFY_TYPE.ERROR });
+        notify({ message: String(err), notifyType: NOTIFY_TYPE.ERROR });
     });
 }
 
@@ -56,7 +58,7 @@ axios.put = (url, data, overrideHeaders = {}) => {
     }).then(res => {
         return res.json();
     }).catch(err => {
-        notify({ message: err, notifyType: NOTIFY_TYPE.ERROR });
+        notify({ message: String(err), notifyType: NOTIFY_TYPE.ERROR });
     });
 }
 
@@ -69,7 +71,7 @@ axios.delete = (url, data, overrideHeaders = {}) => {
     }).then(res => {
         return res.json();
     }).catch(err => {
-        notify({ message: err, notifyType: NOTIFY_TYPE.ERROR });
+        notify({ message: String(err), notifyType: NOTIFY_TYPE.ERROR });
     });
 }
 

app/dashboard/api/global.js

@@ -15,3 +15,7 @@ export const markReaded = (data) => {
 export const getMessage = () => {
     return axios.get('/workspaces/message?page=1&pageSize=10');
 }
+
+export const logout = () => {
+    return axios.get('/logout', { 'Accept': 'application/vnd.coding.v1+json' });
+}

app/dashboard/api/ws.js

@@ -44,10 +44,6 @@ export const getSSHPublicKey = () => {
     return axios.get('/user/public_key', { 'Accept': 'application/vnd.coding.v1+json' });
 }
 
-export const logout = () => {
-    return axios.get('/logout', { 'Accept': 'application/vnd.coding.v1+json' });
-}
-
 export const getCodingProject = () => {
     return axios.get('/projects?page=1&pageSize=1000&type=all&source=Coding', { 'Accept': 'application/vnd.coding.v1+json' });
 }

app/dashboard/view/create/coding/Coding.js

@@ -150,9 +150,6 @@ class Coding extends Component {
         api.syncProject().then(res => {
             this.setState({ isSync: false });
             this.props.fetchCodingProject();
-        }).catch(err => {
-            this.setState({ isSync: false });
-            this.props.fetchCodingProject();
         });
     }
 
@@ -218,17 +215,8 @@ class Coding extends Component {
                     this.handleCreateWorkspace(workspaceOption);
                 } else {
                     hideLoading();
-                    let message;
-                    if (res.msg) {
-                        const msg = res.msg;
-                        if (typeof msg === 'object') {
-                            message = msg[Object.keys(msg)[0]];
-                        } else {
-                            message = res.msg;
-                        }
-                    } else {
-                        message = 'Failed to create project';
-                    }
+                    const msg = res.msg || 'Failed to create project';
+                    const message = typeof msg === 'object' ? msg[Object.keys(msg)[0]] : res.msg;
                     notify({ notifyType: NOTIFY_TYPE.ERROR, message });
                 }
             });