feat: update code

apache · Dec 25, 2020 · f15ed3f · f15ed3f
1 parent 5803f65
commit f15ed3f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/web/src/locales/zh-CN/component.ts b/web/src/locales/zh-CN/component.ts
@@ -32,7 +32,7 @@ export default {
   'component.global.loading': '加载中',
   'component.global.list': '列表',
   'component.global.description': '描述',
-  'component.global.label': '标签',
+  'component.global.labels': '标签',
   'component.global.operation': '操作',
   'component.status.success': '成功',
   'component.status.fail': '失败',

diff --git a/web/src/pages/Route/List.tsx b/web/src/pages/Route/List.tsx
@@ -22,7 +22,6 @@ import { history, useIntl } from 'umi';
 import { PlusOutlined, BugOutlined } from '@ant-design/icons';
 
 import { timestampToLocaleString } from '@/helpers';
-import { transformLabelList } from './transform';
 import { fetchList, remove, fetchLabelList, updateRouteStatus } from './service';
 import { DebugDrawView } from './components/DebugViews';
 
@@ -36,9 +35,7 @@ const Page: React.FC = () => {
   const [labelList, setLabelList] = useState<RouteModule.LabelList>({});
 
   useEffect(() => {
-    fetchLabelList().then((data) => {
-      setLabelList(transformLabelList(data));
-    });
+    fetchLabelList().then(setLabelList);
   }, []);
   enum RouteStatus {
     Offline = 0,

diff --git a/web/src/pages/Route/components/Step1/LabelsDrawer.tsx b/web/src/pages/Route/components/Step1/LabelsDrawer.tsx
@@ -19,7 +19,7 @@ import { AutoComplete, Button, Col, Drawer, Form, notification, Row } from 'antd
 import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons';
 import { useIntl } from 'umi';
 
-import { transformLabelList, transformLableValueToKeyValue } from '../../transform';
+import { transformLableValueToKeyValue } from '../../transform';
 import { fetchLabelList } from '../../service';
 
 interface Props extends Pick<RouteModule.Step1PassProps, 'onChange'> {
@@ -117,13 +117,11 @@ const LabelsDrawer: React.FC<Props> = ({
 
   const { formatMessage } = useIntl();
   const [form] = Form.useForm();
-  const [labelList, setLabelList] = useState<RouteModule.LabelList>();
+  const [labelList, setLabelList] = useState<RouteModule.LabelList>({});
   form.setFieldsValue({ labels: transformLabel });
 
   useEffect(() => {
-    fetchLabelList().then((data) => {
-      setLabelList(transformLabelList(data) as RouteModule.LabelList);
-    });
+    fetchLabelList().then(setLabelList);
   }, []);
 
   return (

diff --git a/web/src/pages/Route/service.ts b/web/src/pages/Route/service.ts
@@ -21,6 +21,7 @@ import {
   transformStepData,
   transformRouteData,
   transformUpstreamNodes,
+  transformLabelList
 } from './transform';
 
 export const create = (data: RouteModule.RequestData) =>
@@ -93,12 +94,12 @@ export const checkHostWithSSL = (hosts: string[]) =>
   });
 
 export const fetchLabelList = () =>
-  request('/labels/route').then(({ data }) => ((data.rows) as RouteModule.ResponseLabelList));
+  request('/labels/route').then(({ data }) => ((transformLabelList(data.rows)) as RouteModule.LabelList));
 
 export const updateRouteStatus = (rid: string, status: RouteModule.RouteStatus) =>
   request(`/routes/${rid}`, {
     method: 'PATCH',
-    data: {status}
+    data: { status }
   });
 
 export const debugRoute = (data: RouteModule.debugRequest) => {