fix: Fix issues

1. service actions callback 2. fix pods link
kubesphere · Jun 14, 2020 · c256291 · c256291
1 parent 13f500c
commit c256291
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 52 deletions.
diff --git a/src/actions/service.js b/src/actions/service.js
@@ -101,12 +101,13 @@ export default {
     },
   },
   'service.edit': {
-    on({ store, detail, ...props }) {
+    on({ store, detail, success, ...props }) {
       const modal = Modal.open({
         onOk: newObject => {
           store.update(detail, newObject).then(() => {
             Modal.close(modal)
             Notify.success({ content: `${t('Updated Successfully')}!` })
+            success && success()
           })
         },
         modal: EditServiceModal,
@@ -118,12 +119,13 @@ export default {
     },
   },
   'service.gateway.edit': {
-    on({ store, detail, ...props }) {
+    on({ store, detail, success, ...props }) {
       const modal = Modal.open({
         onOk: newObject => {
           store.update(detail, newObject).then(() => {
             Modal.close(modal)
             Notify.success({ content: `${t('Updated Successfully')}!` })
+            success && success()
           })
         },
         modal: EditGatewayModal,

diff --git a/src/components/Cards/Monitoring/Controller/index.jsx b/src/components/Cards/Monitoring/Controller/index.jsx
@@ -133,11 +133,14 @@ export default class MonitoringController extends React.Component {
 
   fetchData = (params = {}) => {
     const { cluster } = this.state
-    this.props.onFetch({
+    const query = {
       ...this.params,
       ...params,
-      cluster,
-    })
+    }
+    if (cluster) {
+      query.cluster = cluster
+    }
+    this.props.onFetch(query)
   }
 
   handleChange = data => {

diff --git a/src/components/Cards/Pods/index.jsx b/src/components/Cards/Pods/index.jsx
diff --git a/src/components/Forms/Route/RouteRules/RuleList/index.jsx b/src/components/Forms/Route/RouteRules/RuleList/index.jsx
@@ -92,13 +92,14 @@ export default class RuleList extends React.Component {
   }
 
   renderContent() {
-    const { value, isFederated, projectDetail } = this.props
-    const clusters = keyBy(projectDetail.clusters, 'name')
+    const { value, isFederated } = this.props
 
     let rules = [...value]
     let tls = get(this.context.formData, 'spec.tls[0]')
 
     if (isFederated) {
+      const { projectDetail } = this.props
+      const clusters = keyBy(projectDetail.clusters, 'name')
       const result = ObjectMapper.federated(ObjectMapper.ingresses)(
         this.context.formData
       )

diff --git a/src/components/Forms/Route/RouteRules/index.jsx b/src/components/Forms/Route/RouteRules/index.jsx
@@ -93,7 +93,7 @@ class RouteRules extends React.Component {
   get services() {
     return this.serviceStore.list.data.map(item => ({
       ...item,
-      ports: item.resource.ports,
+      ports: item.resource ? item.resource.ports : item.ports,
     }))
   }
 

diff --git a/src/components/Forms/Workload/ContainerSettings/index.jsx b/src/components/Forms/Workload/ContainerSettings/index.jsx
@@ -170,7 +170,7 @@ export default class ContainerSetting extends React.Component {
       this.imageRegistryStore.fetchListByK8s({
         cluster,
         namespace,
-        fieldSelector: `spec.template.type=kubernetes.io/dockerconfigjson`,
+        fieldSelector: `type=kubernetes.io/dockerconfigjson`,
       }),
     ]).then(([configMaps, secrets, quota, limitRanges, imageRegistries]) => {
       this.setState({

diff --git a/src/components/HOCs/withList.js b/src/components/HOCs/withList.js
@@ -275,7 +275,11 @@ export class ListPage extends React.Component {
           const kind = MODULE_KIND_MAP[this.props.module]
           if (message.object.kind === kind) {
             if (message.type === 'MODIFIED') {
-              this.store.list.updateItem(this.store.mapper(message.object))
+              const data = {
+                ...this.props.match.params,
+                ...this.store.mapper(message.object),
+              }
+              this.store.list.updateItem(data)
             } else if (message.type === 'DELETED' || message.type === 'ADDED') {
               _getData()
             }

diff --git a/src/core/global.js b/src/core/global.js
@@ -71,7 +71,7 @@ export default class GlobalValue {
       const defaultActions = get(
         globals.user,
         `projectRules[${cluster}][${project}]._`,
-        []
+        this.getActions({ cluster, module })
       )
       return adapter(
         get(

diff --git a/src/locales/en/cluster.js b/src/locales/en/cluster.js
@@ -96,4 +96,8 @@ export default {
   CLUSTER_VISIBILITY_Q2: 'What is a public cluster?',
   CLUSTER_VISIBILITY_A2:
     'A public cluster means all platform users can access the cluster, in which they are able to create and schedule resources.',
+
+  CLUSTER_AGENT_TITLE:
+    'Please add the cluster based on the Agent provided in the cluster.',
+  CLUSTER_AGENT_DESC: 'A corresponding Agent needs to be set in the cluster.',
 }
diff --git a/src/locales/zh/cluster.js b/src/locales/zh/cluster.js
@@ -176,4 +176,7 @@ export default {
     'KubeSphere 控制平面通过代理方式连接待导入集群，控制平面启动一个公开的代理服务，待导入集群创建相应的客户端组件连接代理服务，与控制平面之间建立一个反向代理。此种方式不需要待导入集群和控制平面在同一网络，也不要求待导入集群暴露集群的 apiserver 地址，但会有一定的网络性能损耗</br></br>通常适用于:</br>1. 当前集群和待导入集群不在同一网络中<br/>2. 当前集群和待导入集群无法通过vpn或隧道等其它技术连通所在网络<br/>3. 对集群间网络性能损耗能容忍',
 
   HOW_TO_GET_KUBECONFIG: '如何获取KubeConfig?',
+
+  CLUSTER_AGENT_TITLE: '请根据集群中提供的代理连接设置加入集群',
+  CLUSTER_AGENT_DESC: '需要在集群中设置下相应的代理Agent',
 }
diff --git a/src/pages/clusters/containers/Clusters/AddCluster/Configuration/index.jsx b/src/pages/clusters/containers/Clusters/AddCluster/Configuration/index.jsx
@@ -116,8 +116,8 @@ export default class BaseInfo extends React.Component {
         ) : (
           <div className={styles.tip}>
             <Text
-              title={t('请根据集群中提供的代理连接设置加入集群')}
-              description={t('需要在集群中设置下相应的代理Agent')}
+              title={t('CLUSTER_AGENT_TITLE')}
+              description={t('CLUSTER_AGENT_DESC')}
             />
             <div className="margin-t12">
               {t.html('CLUSTER_AGENT_IMPORT_TIP')}

diff --git a/src/pages/clusters/containers/Projects/Detail/index.jsx b/src/pages/clusters/containers/Projects/Detail/index.jsx
@@ -63,18 +63,21 @@ export default class ProjectDetail extends React.Component {
   }
 
   getOperations = () => {
-    const { workspace, cluster, name } = this.store.detail
+    const { workspace, cluster, name, isFedManaged } = this.store.detail
+
+    let url = `/${workspace}/clusters/${cluster}/projects/${name}`
+    if (isFedManaged) {
+      url = `/${workspace}/federatedprojects/${name}`
+    }
+
     return [
       {
         key: 'enter',
         text: t('Enter the project'),
         action: 'view',
         type: 'control',
         show: globals.app.workspaces.includes(workspace),
-        onClick: () =>
-          this.routing.push(
-            `/${workspace}/clusters/${cluster}/projects/${name}`
-          ),
+        onClick: () => this.routing.push(url),
       },
       {
         key: 'edit',

diff --git a/src/pages/fedprojects/containers/Deployments/Detail/ResourceStatus/index.jsx b/src/pages/fedprojects/containers/Deployments/Detail/ResourceStatus/index.jsx
@@ -121,6 +121,7 @@ class ResourceStatus extends React.Component {
         detail={detail}
         clusters={clusters}
         onUpdate={this.handlePodUpdate}
+        isFederated
       />
     )
   }

diff --git a/src/pages/fedprojects/containers/Services/Detail/ResourceStatus/index.jsx b/src/pages/fedprojects/containers/Services/Detail/ResourceStatus/index.jsx
@@ -122,6 +122,7 @@ export default class ResourceStatus extends React.Component {
         clusters={clusters}
         onUpdate={this.handlePodUpdate}
         isLoading={isResourcesLoading}
+        isFederated
       />
     )
   }

diff --git a/src/pages/projects/components/Modals/CreateApp/Routes/RuleList/index.jsx b/src/pages/projects/components/Modals/CreateApp/Routes/RuleList/index.jsx
@@ -45,19 +45,13 @@ export default class RuleList extends React.Component {
   }
 
   renderContent() {
-    const {
-      data,
-      onAdd,
-      onDelete,
-      isFederated,
-      projectDetail,
-      gateway,
-    } = this.props
-    const clusters = keyBy(projectDetail.clusters, 'name')
+    const { data, onAdd, onDelete, isFederated, gateway } = this.props
     let rules = get(data, 'spec.rules', [])
     let tls = get(data, 'spec.tls[0]', {})
 
     if (isFederated) {
+      const { projectDetail } = this.props
+      const clusters = keyBy(projectDetail.clusters, 'name')
       const result = ObjectMapper.federated(ObjectMapper.ingresses)(data)
       if (result && result.clusterTemplates) {
         rules = Object.keys(result.clusterTemplates).map(cluster => ({

diff --git a/src/pages/projects/containers/CronJobs/Detail/index.jsx b/src/pages/projects/containers/CronJobs/Detail/index.jsx
@@ -105,17 +105,6 @@ export default class JobDetail extends React.Component {
           detail: this.store.detail,
         }),
     },
-    {
-      key: 'redeploy',
-      icon: 'restart',
-      text: t('Redeploy'),
-      action: 'edit',
-      onClick: () =>
-        this.trigger('workload.redeploy', {
-          module: this.module,
-          detail: this.store.detail,
-        }),
-    },
     {
       key: 'delete',
       icon: 'trash',

diff --git a/src/pages/projects/containers/Jobs/Detail/index.jsx b/src/pages/projects/containers/Jobs/Detail/index.jsx
@@ -100,7 +100,7 @@ export default class JobDetail extends React.Component {
       onClick: () =>
         this.trigger('resource.yaml.edit', {
           detail: this.store.detail,
-          readonly: true,
+          readOnly: true,
         }),
     },
     {

diff --git a/src/pages/projects/containers/Routes/Detail/ResourceStatus/Rule.jsx b/src/pages/projects/containers/Routes/Detail/ResourceStatus/Rule.jsx
@@ -45,7 +45,7 @@ const Card = ({ gateway, rule, tls = {}, prefix }) => {
         <Icon name="earth" size={40} />
         <div className={styles.title}>
           {host}
-          <p>
+          <div>
             <span>
               {t('Protocol')}: {protocol}
             </span>
@@ -61,7 +61,7 @@ const Card = ({ gateway, rule, tls = {}, prefix }) => {
                 <Icon name="question" />
               </Tooltip>
             </span>
-          </p>
+          </div>
         </div>
       </div>
       {rule.http.paths.map(path => (

diff --git a/src/pages/projects/containers/Routes/Detail/ResourceStatus/index.scss b/src/pages/projects/containers/Routes/Detail/ResourceStatus/index.scss
@@ -66,7 +66,7 @@
   color: $text-color;
   vertical-align: middle;
 
-  p {
+  & > div {
     font-size: $body-size;
     color: #79879c;
     font-weight: $font-normal;

diff --git a/src/pages/projects/containers/Routes/Detail/index.jsx b/src/pages/projects/containers/Routes/Detail/index.jsx
@@ -86,7 +86,7 @@ export default class RouteDetail extends React.Component {
       action: 'edit',
       onClick: () =>
         this.trigger('resource.yaml.edit', {
-          detail: this.store.detail,
+          detail: toJS(this.store.detail),
           success: this.fetchData,
         }),
     },
@@ -97,7 +97,7 @@ export default class RouteDetail extends React.Component {
       action: 'edit',
       onClick: () =>
         this.trigger('router.rules.edit', {
-          detail: this.store.detail,
+          detail: toJS(this.store.detail),
           success: this.fetchData,
         }),
     },
@@ -108,7 +108,7 @@ export default class RouteDetail extends React.Component {
       action: 'edit',
       onClick: () =>
         this.trigger('router.annotations.edit', {
-          detail: this.store.detail,
+          detail: toJS(this.store.detail),
           success: this.fetchData,
         }),
     },

diff --git a/src/pages/projects/containers/Services/Detail/index.jsx b/src/pages/projects/containers/Services/Detail/index.jsx
@@ -96,6 +96,7 @@ export default class ServiceDetail extends React.Component {
       onClick: () =>
         this.trigger('service.edit', {
           detail: this.store.detail,
+          success: this.fetchData,
         }),
     },
     {
@@ -107,6 +108,7 @@ export default class ServiceDetail extends React.Component {
       onClick: () =>
         this.trigger('service.gateway.edit', {
           detail: this.store.detail,
+          success: this.fetchData,
         }),
     },
     {