fix: Fix cluster api

kubesphere · Jun 23, 2020 · 7909879 · 7909879
1 parent 4cf4df4
commit 7909879
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/actions/resource.edit.js b/src/actions/resource.edit.js
@@ -16,6 +16,7 @@
  * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import { toJS } from 'mobx'
 import { Modal } from 'components/Base'
 import EditBasicInfoModal from 'components/Modals/EditBasicInfo'
 import EditYamlModal from 'components/Modals/EditYaml'
@@ -30,7 +31,7 @@ export default {
             success && success()
           })
         },
-        detail: detail._originData || detail,
+        detail: toJS(detail._originData || detail),
         modal: EditBasicInfoModal,
         store,
         ...props,

diff --git a/src/actions/service.js b/src/actions/service.js
@@ -111,7 +111,7 @@ export default {
           })
         },
         modal: EditServiceModal,
-        detail: detail._originData,
+        detail: toJS(detail._originData),
         type: detail.type,
         store,
         ...props,

diff --git a/src/components/Forms/Service/ServiceSettings/WorkloadSelect/index.jsx b/src/components/Forms/Service/ServiceSettings/WorkloadSelect/index.jsx
@@ -17,6 +17,7 @@
  */
 
 import React from 'react'
+import { toJS } from 'mobx'
 import { observer } from 'mobx-react'
 import { get } from 'lodash'
 import { RadioButton, RadioGroup } from '@pitrix/lego-ui'
@@ -71,7 +72,7 @@ export default class WorkloadSelect extends React.Component {
 
   render() {
     const { type, selectItem } = this.state
-    const { data, total, page, isLoading } = this.store.list
+    const { data, total, page, isLoading } = toJS(this.store.list)
 
     return (
       <div>

diff --git a/src/stores/cluster/index.js b/src/stores/cluster/index.js
@@ -50,9 +50,6 @@ export default class ClusterStore extends Base {
   getAgentUrl = ({ cluster }) =>
     `kapis/cluster.kubesphere.io/v1alpha1/clusters/${cluster}/agent/deployment`
 
-  getDetailUrl = (params = {}) =>
-    `${this.getResourceUrl(params)}/${params.name}`
-
   @action
   async fetchList({ cluster, workspace, namespace, more, ...params } = {}) {
     this.list.isLoading = true
@@ -104,7 +101,9 @@ export default class ClusterStore extends Base {
     if (!globals.app.isMultiCluster) {
       detail = this.mapper(cloneDeep(DEFAULT_CLUSTER))
     } else {
-      const result = await request.get(this.getDetailUrl(params))
+      const result = await request.get(
+        `${this.getResourceUrl(params)}/${params.name}`
+      )
       detail = { ...params, ...this.mapper(result) }
     }