From c2a6cb833cde178079f9f47912cbbf89dafb5176 Mon Sep 17 00:00:00 2001
From: mango <xu.weiKyrie@foxmail.com>
Date: Wed, 29 Dec 2021 10:16:36 +0800
Subject: [PATCH 1/2] feat: show route id in list and edit views.

Signed-off-by: mango <xu.weiKyrie@foxmail.com>
---
 web/src/locales/en-US/component.ts            |  1 +
 web/src/locales/zh-CN/component.ts            |  1 +
 web/src/pages/Route/List.tsx                  |  4 ++++
 .../pages/Route/components/Step1/MetaView.tsx | 22 ++++++++++++++++++-
 web/src/pages/Route/transform.ts              |  2 ++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/web/src/locales/en-US/component.ts b/web/src/locales/en-US/component.ts
index 6cf033ab32..e844439ffd 100644
--- a/web/src/locales/en-US/component.ts
+++ b/web/src/locales/en-US/component.ts
@@ -67,6 +67,7 @@ export default {
   'component.global.sendTimeout': 'Send Timeout',
   'component.global.receiveTimeout': 'Receive Timeout',
   'component.global.name': 'Name',
+  'component.global.id': 'ID',
   'component.global.updateTime': 'Update Time',
   'component.global.form.itemExtraMessage.nameGloballyUnique': 'Name should be globally unique',
   'component.global.input.placeholder.description':
diff --git a/web/src/locales/zh-CN/component.ts b/web/src/locales/zh-CN/component.ts
index 112211e81e..074b6befb8 100644
--- a/web/src/locales/zh-CN/component.ts
+++ b/web/src/locales/zh-CN/component.ts
@@ -56,6 +56,7 @@ export default {
   'component.global.sendTimeout': '发送超时时间',
   'component.global.receiveTimeout': '接收超时时间',
   'component.global.name': '名称',
+  'component.global.id': 'ID',
   'component.global.updateTime': '更新时间',
 
   'component.global.popconfirm.title.delete': '确定删除该条记录吗？',
diff --git a/web/src/pages/Route/List.tsx b/web/src/pages/Route/List.tsx
index 23ea82ec9c..de98d75a41 100644
--- a/web/src/pages/Route/List.tsx
+++ b/web/src/pages/Route/List.tsx
@@ -335,6 +335,10 @@ const Page: React.FC = () => {
       dataIndex: 'name',
       fixed: 'left',
     },
+    {
+      title: formatMessage({ id: 'component.global.id' }),
+      dataIndex: 'id',
+    },
     {
       title: formatMessage({ id: 'page.route.host' }),
       hideInSearch: true,
diff --git a/web/src/pages/Route/components/Step1/MetaView.tsx b/web/src/pages/Route/components/Step1/MetaView.tsx
index c8b478dd8d..4171d95088 100644
--- a/web/src/pages/Route/components/Step1/MetaView.tsx
+++ b/web/src/pages/Route/components/Step1/MetaView.tsx
@@ -153,6 +153,23 @@ const MetaView: React.FC<RouteModule.Step1PassProps> = ({
     </Form.Item>
   );
 
+  const Id: React.FC = () => {
+    if (isEdit) {
+      return (
+        <Form.Item label={formatMessage({ id: 'component.global.id' })}>
+          <Row>
+            <Col span={10}>
+              <Form.Item noStyle name="id">
+                <Input disabled={true} />
+              </Form.Item>
+            </Col>
+          </Row>
+        </Form.Item>
+      );
+    }
+    return null;
+  };
+
   const Description: React.FC = () => (
     <Form.Item label={formatMessage({ id: 'component.global.description' })}>
       <Row>
@@ -316,7 +333,9 @@ const MetaView: React.FC<RouteModule.Step1PassProps> = ({
                 showSearch
                 disabled={disabled}
                 optionFilterProp="children"
-                filterOption={(input, option) => option?.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+                filterOption={(input, option) =>
+                  option?.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }
               >
                 {/* TODO: value === '' means  no service_id select, need to find a better way */}
                 <Select.Option value="" key={Math.random().toString(36).substring(7)}>
@@ -361,6 +380,7 @@ const MetaView: React.FC<RouteModule.Step1PassProps> = ({
   return (
     <PanelSection title={formatMessage({ id: 'page.route.panelSection.title.nameDescription' })}>
       <Name />
+      <Id />
       <NormalLabelComponent />
       <VersionLabelComponent />
 
diff --git a/web/src/pages/Route/transform.ts b/web/src/pages/Route/transform.ts
index 14d4fa7bed..cafc2e8886 100644
--- a/web/src/pages/Route/transform.ts
+++ b/web/src/pages/Route/transform.ts
@@ -314,6 +314,7 @@ export const transformUpstreamNodes = (
 export const transformRouteData = (data: RouteModule.Body) => {
   const {
     name,
+    id,
     desc,
     labels = {},
     methods = [],
@@ -334,6 +335,7 @@ export const transformRouteData = (data: RouteModule.Body) => {
 
   const form1Data: Partial<RouteModule.Form1Data> = {
     name,
+    id,
     desc,
     status,
     hosts: hosts || (host && [host]) || [''],

From 7f4d292dca2633ebfa6e22cd1e6513bfaf7a1701 Mon Sep 17 00:00:00 2001
From: mango <xu.weiKyrie@foxmail.com>
Date: Tue, 4 Jan 2022 09:36:13 +0800
Subject: [PATCH 2/2] fix: hide id in search and trigger ci workflow

Signed-off-by: mango <xu.weiKyrie@foxmail.com>
---
 web/src/pages/Route/List.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/pages/Route/List.tsx b/web/src/pages/Route/List.tsx
index de98d75a41..8191640e75 100644
--- a/web/src/pages/Route/List.tsx
+++ b/web/src/pages/Route/List.tsx
@@ -337,6 +337,7 @@ const Page: React.FC = () => {
     },
     {
       title: formatMessage({ id: 'component.global.id' }),
+      hideInSearch: true,
       dataIndex: 'id',
     },
     {