diff --git a/src/locales/tc/application.js b/src/locales/tc/application.js index 539a9f2a7b4..4a71b6227c3 100644 --- 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 index 1f20f5e5f62..04945a530b9 100644 --- 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 index 38fb5ca1b13..3896eb5f52d 100644 --- 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 index 74eddfe40f2..3527b602676 100644 --- 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 index 4e33815c15f..ba461d7d1b6 100644 --- 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 index 588b66643b8..52fc0c261d6 100644 --- 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 {