diff --git a/releasenotes/notes/Support-External-Network-Name-For-Router-760ab8b579e548c7.yaml b/releasenotes/notes/Support-External-Network-Name-For-Router-760ab8b579e548c7.yaml new file mode 100644 index 00000000..3c55137c --- /dev/null +++ b/releasenotes/notes/Support-External-Network-Name-For-Router-760ab8b579e548c7.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Support external network name in the router list page diff --git a/src/locales/en.json b/src/locales/en.json index 1fc5aaeb..3113c103 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -979,6 +979,7 @@ "External IP(V4)": "External IP(V4)", "External IP(V6)": "External IP(V6)", "External Network": "External Network", + "External Network ID/Name": "External Network ID/Name", "External Network Info": "External Network Info", "External Networks": "External Networks", "External Port": "External Port", diff --git a/src/locales/ko-kr.json b/src/locales/ko-kr.json index ddb27510..4d8d3abb 100644 --- a/src/locales/ko-kr.json +++ b/src/locales/ko-kr.json @@ -979,6 +979,7 @@ "External IP(V4)": "외부 IP(V4)", "External IP(V6)": "외부 IP(V6)", "External Network": "외부 네트워크", + "External Network ID/Name": "외부 네트워크 ID/이름", "External Network Info": "외부 네트워크 정보", "External Networks": "외부 네트워크", "External Port": "외부 포트", diff --git a/src/locales/ru.json b/src/locales/ru.json index fb79d301..4a61ef08 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -979,6 +979,7 @@ "External IP(V4)": "Внешний IP (IPv4)", "External IP(V6)": "Внешний IP (IPv6)", "External Network": "Внешняя сеть", + "External Network ID/Name": "Идентификатор/имя внешней сети", "External Network Info": "Информация о внешней сети", "External Networks": "Внешние сети", "External Port": "Внешний порт", diff --git a/src/locales/tr-tr.json b/src/locales/tr-tr.json index b2536893..99a02915 100644 --- a/src/locales/tr-tr.json +++ b/src/locales/tr-tr.json @@ -979,6 +979,7 @@ "External IP(V4)": "Harici IP(V4)", "External IP(V6)": "Harici IP(V6)", "External Network": "Harici Ağ", + "External Network ID/Name": "Harici ağ kimliği/adı", "External Network Info": "Harici Ağ Bilgisi", "External Networks": "Harici Ağlar", "External Port": "Harici Ağ Adaptörü", diff --git a/src/locales/zh-hans.json b/src/locales/zh-hans.json index 2279036c..9480cbc4 100644 --- a/src/locales/zh-hans.json +++ b/src/locales/zh-hans.json @@ -979,6 +979,7 @@ "External IP(V4)": "外网IP(V4)", "External IP(V6)": "外网IP(V6)", "External Network": "外部网络", + "External Network ID/Name": "外部网络ID/名称", "External Network Info": "外部网络信息", "External Networks": "外部网络", "External Port": "源端口", diff --git a/src/resources/neutron/router.jsx b/src/resources/neutron/router.jsx index 1877f5b1..f863149e 100644 --- a/src/resources/neutron/router.jsx +++ b/src/resources/neutron/router.jsx @@ -19,7 +19,6 @@ import { getSubnetToRouter, } from 'resources/neutron/floatingip'; import { getOptions } from 'utils'; -import { getNameRenderByRouter } from 'utils/table'; export const routerStatus = { ACTIVE: t('Active'), @@ -59,30 +58,13 @@ export const getRouterColumns = (self) => [ sorter: false, }, { - title: t('External Network'), - dataIndex: 'externalNetworkId', + title: t('External Network ID/Name'), + dataIndex: 'externalNetworkName', isHideable: true, sorter: false, - render: (value, record) => { - if (!value) { - return '-'; - } - const { externalNetworkName: name } = record; - const routerColumn = { - dataIndex: 'name', - routeName: self.getRouteName('networkDetail'), - idKey: 'id', - }; - const data = { name, id: value }; - return getNameRenderByRouter(null, routerColumn)(name, data); - }, - stringify: (value, record) => { - if (!value) { - return '-'; - } - const { externalNetworkName: name } = record; - return `${value}(${name || '-'})`; - }, + isLink: true, + idKey: 'externalNetworkId', + routeName: self.getRouteName('networkDetail'), }, { title: t('External Fixed IP'),