fix: Fix application ingress

kubesphere · Jul 10, 2020 · 15fb666 · 15fb666
1 parent d6a7076
commit 15fb666
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 19 deletions.
diff --git a/src/locales/tc/application.js b/src/locales/tc/application.js
@@ -22,7 +22,7 @@ export default {
   'Deployed Applications': '已部署應用',
   'Deploy New Application': '部署新應用',
   'Deploy App': '部署應用',
-  'Create Application': '構建應用',
+  'Create Composing Application': '構建應用',
   'App Template': '應用範本',
   Deploy: '部署',
   'Application Type': '應用類型',

diff --git a/src/locales/zh/application.js b/src/locales/zh/application.js
@@ -22,7 +22,7 @@ export default {
   'Deployed Applications': '已部署应用',
   'Deploy New Application': '部署新应用',
   'Deploy App': '部署应用',
-  'Create Application': '构建应用',
+  'Create Composing Application': '构建自制应用',
   'App Template': '应用模板',
   Deploy: '部署',
   'Application Type': '应用类型',

diff --git a/src/pages/fedprojects/containers/Applications/Detail/AppIngresses/Ingresses/index.jsx b/src/pages/fedprojects/containers/Applications/Detail/AppIngresses/Ingresses/index.jsx
@@ -57,7 +57,10 @@ export default class Components extends Component {
 
       this.routerStore.fetchListByK8s(params)
     }
-    this.routerStore.getGateway(detail)
+    this.routerStore.getGateway({
+      cluster,
+      ...detail,
+    })
   }
 
   getNodePorts(gateway) {

diff --git a/src/pages/fedprojects/containers/Applications/Detail/Tracing/index.jsx b/src/pages/fedprojects/containers/Applications/Detail/Tracing/index.jsx
@@ -118,6 +118,11 @@ export default class Tracing extends React.Component {
   fetchTracing = () => {
     const { namespace } = toJS(this.detailStore.detail)
     const { cluster } = this.state
+
+    if (!cluster || !get(cluster, 'configz.servicemesh')) {
+      return
+    }
+
     const query = {
       namespace,
       cluster: cluster.name,

diff --git a/src/pages/fedprojects/containers/Applications/index.jsx b/src/pages/fedprojects/containers/Applications/index.jsx
@@ -142,7 +142,7 @@ export default class CRDApps extends React.Component {
           {
             key: 'create',
             type: 'control',
-            text: t('Create Application'),
+            text: t('Create Composing Application'),
             onClick: this.showCreate,
           },
         ]

diff --git a/src/pages/projects/components/Modals/CreateApp/Routes/RuleList/index.jsx b/src/pages/projects/components/Modals/CreateApp/Routes/RuleList/index.jsx
@@ -70,9 +70,9 @@ export default class RuleList extends React.Component {
       <ul>
         {rules
           .filter(item => item.host)
-          .map(rule => (
+          .map((rule, index) => (
             <Item
-              key={rule.host}
+              key={`${rule.host}-${index}`}
               rule={rule}
               tls={tls}
               onEdit={onAdd}

diff --git a/src/pages/projects/components/Modals/ServiceDelete/index.jsx b/src/pages/projects/components/Modals/ServiceDelete/index.jsx
@@ -19,7 +19,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
-import { get, flatten, isArray, isEmpty } from 'lodash'
+import { get, flatten, isArray, isEmpty, uniqBy } from 'lodash'
 import { Icon, Checkbox } from '@pitrix/lego-ui'
 
 import { joinSelector, getDisplayName } from 'utils'
@@ -166,7 +166,7 @@ export default class ServiceDeleteModal extends React.Component {
 
     const results = await Promise.all(requests)
     this.setState({
-      relatedResources: flatten(results),
+      relatedResources: uniqBy(flatten(results), 'uid'),
       isLoading: false,
     })
   }

diff --git a/src/pages/projects/components/Modals/WorkloadDelete/index.jsx b/src/pages/projects/components/Modals/WorkloadDelete/index.jsx
@@ -19,7 +19,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
-import { flatten, isArray, isEmpty, get } from 'lodash'
+import { flatten, isArray, isEmpty, get, uniqBy } from 'lodash'
 import { Icon, Checkbox } from '@pitrix/lego-ui'
 
 import { joinSelector } from 'utils'
@@ -145,7 +145,7 @@ export default class WorkloadDeleteModal extends React.Component {
 
     const results = await Promise.all(requests)
     this.setState({
-      relatedResources: flatten(results),
+      relatedResources: uniqBy(flatten(results), 'uid'),
       isLoading: false,
     })
   }

diff --git a/src/pages/projects/containers/Applications/CRDApps.jsx b/src/pages/projects/containers/Applications/CRDApps.jsx
@@ -118,7 +118,7 @@ export default class CRDApps extends React.Component {
           {
             key: 'create',
             type: 'control',
-            text: t('Create Application'),
+            text: t('Create Composing Application'),
             onClick: this.showCreate,
           },
         ]

diff --git a/src/pages/workspaces/containers/BaseInfo/index.jsx b/src/pages/workspaces/containers/BaseInfo/index.jsx
@@ -169,6 +169,7 @@ class BaseInfo extends React.Component {
         name: 'DevOps Projects',
         icon: 'strategy-group',
         value: metrics.workspace_devops_project_count,
+        hidden: !globals.app.hasKsModule('devops'),
       },
       {
         name: 'Workspace Members',
@@ -205,14 +206,16 @@ class BaseInfo extends React.Component {
           )}
         </div>
         <div className={styles.content}>
-          {options.map(option => (
-            <Text
-              key={option.name}
-              icon={option.icon}
-              title={option.value}
-              description={t(option.name)}
-            />
-          ))}
+          {options
+            .filter(option => !option.hidden)
+            .map(option => (
+              <Text
+                key={option.name}
+                icon={option.icon}
+                title={option.value}
+                description={t(option.name)}
+              />
+            ))}
         </div>
       </Panel>
     )

diff --git a/src/pages/workspaces/containers/FedProjects/index.jsx b/src/pages/workspaces/containers/FedProjects/index.jsx
@@ -159,6 +159,7 @@ export default class Projects extends React.Component {
     this.props.trigger('federated.project.create', {
       ...this.props.match.params,
       store: this.projectStore,
+      clusters: this.clusters.slice(),
       success: () => this.getData(),
     })