feat: add route group

web/src/locales/en-US/component.ts

@@ -32,6 +32,7 @@ export default {
   'component.global.loading': 'Loading',
   'component.global.list': 'List',
   'component.global.description': 'Description',
+  'component.global.label': 'Label',
   'component.global.operation': 'Operation',
   'component.status.success': 'Successfully',
   'component.status.fail': 'Failed',

web/src/locales/zh-CN/component.ts

@@ -32,6 +32,7 @@ export default {
   'component.global.loading': '加载中',
   'component.global.list': '列表',
   'component.global.description': '描述',
+  'component.global.label': '标签',
   'component.global.operation': '操作',
   'component.status.success': '成功',
   'component.status.fail': '失败',

web/src/pages/Route/Create.tsx

@@ -112,6 +112,9 @@ const Page: React.FC<Props> = (props) => {
             if (action === 'advancedMatchingRulesChange') {
               setAdvancedMatchingRules(data);
             }
+            if (action === 'labelsChange') {
+              form1.setFieldsValue({ ...form1.getFieldsValue(), labels: data })
+            }
           }}
           isEdit={props.route.path.indexOf('edit') > 0}
         />
@@ -253,11 +256,10 @@ const Page: React.FC<Props> = (props) => {
   return (
     <>
       <PageHeaderWrapper
-        title={`${
-          (props as any).match.params.rid
-            ? formatMessage({ id: 'component.global.edit' })
-            : formatMessage({ id: 'component.global.create' })
-        } ${formatMessage({ id: 'menu.routes' })}`}
+        title={`${(props as any).match.params.rid
+          ? formatMessage({ id: 'component.global.edit' })
+          : formatMessage({ id: 'component.global.create' })
+          } ${formatMessage({ id: 'menu.routes' })}`}
       >
         <Card bordered={false}>
           <Steps current={step - 1} className={styles.steps}>

web/src/pages/Route/List.tsx

@@ -14,21 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useRef, useState } from 'react';
+import React, { useRef, useEffect, useState } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
-import { Button, Popconfirm, notification, Tag, Space } from 'antd';
+import { Button, Popconfirm, notification, Tag, Space, Select } from 'antd';
 import { history, useIntl } from 'umi';
 import { PlusOutlined, BugOutlined } from '@ant-design/icons';
-import { timestampToLocaleString } from '@/helpers';
 
-import { fetchList, remove, updateRouteStatus } from './service';
+import { timestampToLocaleString } from '@/helpers';
+import { transformLabelList } from './transform';
+import { fetchList, remove, fetchLabelList, updateRouteStatus } from './service';
 import { DebugDrawView } from './components/DebugViews';
 
+
+const { OptGroup, Option } = Select;
+
 const Page: React.FC = () => {
   const ref = useRef<ActionType>();
   const { formatMessage } = useIntl();
 
+  const [labelList, setLabelList] = useState<RouteModule.LabelList>({});
+
+  useEffect(() => {
+    fetchLabelList().then((data) => {
+      setLabelList(transformLabelList(data));
+    });
+  }, []);
   enum RouteStatus {
     Offline = 0,
     Publish,
@@ -90,6 +101,47 @@ const Page: React.FC = () => {
       dataIndex: 'desc',
       hideInSearch: true,
     },
+    {
+      title: formatMessage({ id: 'component.global.label' }),
+      dataIndex: 'labels',
+      render: (_, record) => {
+        return Object.keys(record.labels || {}).map((item) => (
+          <Tag key={Math.random().toString(36).slice(2)}>
+            {item}:{record.labels[item]}
+          </Tag>
+        ));
+      },
+      renderFormItem: (_, { type }) => {
+        if (type === 'form') {
+          return null;
+        }
+
+        return (
+          <Select
+            mode="tags"
+            style={{ width: '100%' }}
+            tagRender={(props) => {
+              const { value, closable, onClose } = props;
+              return (
+                <Tag closable={closable} onClose={onClose} style={{ marginRight: 3 }}>
+                  {value}
+                </Tag>
+              );
+            }}
+          >
+            {Object.keys(labelList).map((key) => {
+              return (
+                <OptGroup label={key} key={Math.random().toString(36).slice(2)}>
+                  {(labelList[key] || []).map((value: string) => (
+                    <Option key={Math.random().toString(36).slice(2)} value={`${key}:${value}`}> {value} </Option>
+                  ))}
+                </OptGroup>
+              );
+            })}
+          </Select>
+        );
+      }
+    },
     {
       title: formatMessage({ id: 'page.route.status' }),
       dataIndex: 'status',
@@ -98,8 +150,8 @@ const Page: React.FC = () => {
           {record.status ? (
             <Tag color="green">{formatMessage({ id: 'page.route.published' })}</Tag>
           ) : (
-            <Tag color="red">{formatMessage({ id: 'page.route.unpublished' })}</Tag>
-          )}
+              <Tag color="red">{formatMessage({ id: 'page.route.unpublished' })}</Tag>
+            )}
         </>
       ),
     },

web/src/pages/Route/components/Step1/LabelsDrawer.tsx

@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React, { useEffect, useState } from 'react';
+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 { fetchLabelList } from '../../service';
+
+interface Props extends Pick<RouteModule.Step1PassProps, 'onChange'> {
+  labelsDataSource: string[];
+  disabled: boolean;
+  onClose(): void;
+}
+
+const LabelList = (disabled: boolean, labelList: RouteModule.LabelList) => {
+  const { formatMessage } = useIntl();
+
+  const keyOptions = Object.keys(labelList || {}).map((item) => ({ value: item }));
+  return (
+    <Form.List name="labels">
+      {(fields, { add, remove }) => {
+        return (
+          <>
+            {fields.map((field, index) => (
+              <Form.Item
+                key={field.key}
+                label={index === 0 && 'Label'}
+                labelCol={{ span: index === 0 ? 3 : 0 }}
+                wrapperCol={{ offset: index === 0 ? 0 : 3 }}
+              >
+                <Row style={{ marginBottom: 10 }} gutter={16}>
+                  <Col>
+                    <Form.Item
+                      style={{ marginBottom: 0 }}
+                      name={[field.name, 'labelKey']}
+                      rules={[
+                        {
+                          required: true,
+                          message: 'Please input key',
+                        },
+                      ]}
+                    >
+                      <AutoComplete options={keyOptions} style={{ width: 100 }} />
+                    </Form.Item>
+                  </Col>
+                  <Col>
+                    <Form.Item shouldUpdate noStyle>
+                      {({ getFieldValue }) => {
+                        const key = getFieldValue(['labels', field.name, 'labelKey']);
+                        let valueOptions = [{ value: '' }];
+                        if (labelList) {
+                          valueOptions = (labelList[key] || []).map((item) => ({ value: item }));
+                        }
+
+                        return (
+                          <Form.Item
+                            noStyle
+                            name={[field.name, 'labelValue']}
+                            fieldKey={[field.fieldKey, 'labelValue']}
+                            rules={[
+                              {
+                                required: true,
+                                message: 'Please input value',
+                              },
+                            ]}
+                          >
+                            <AutoComplete options={valueOptions} style={{ width: 100 }} />
+                          </Form.Item>
+                        );
+                      }}
+                    </Form.Item>
+                  </Col>
+                  <Col>
+                    {!disabled && <MinusCircleOutlined onClick={() => remove(field.name)} />}
+                  </Col>
+                </Row>
+              </Form.Item>
+            ))}
+            {!disabled && (
+              <Form.Item wrapperCol={{ offset: 3 }}>
+                <Button type="dashed" onClick={add}>
+                  <PlusOutlined />
+                  {formatMessage({ id: 'component.global.add' })}
+                </Button>
+              </Form.Item>
+            )}
+          </>
+        );
+      }}
+    </Form.List>
+  );
+};
+
+const LabelsDrawer: React.FC<Props> = ({
+  disabled,
+  labelsDataSource,
+  onClose,
+  onChange = () => { },
+}) => {
+  const transformLabel = transformLableValueToKeyValue(labelsDataSource);
+
+  const { formatMessage } = useIntl();
+  const [form] = Form.useForm();
+  const [labelList, setLabelList] = useState<RouteModule.LabelList>();
+  form.setFieldsValue({ labels: transformLabel });
+
+  useEffect(() => {
+    fetchLabelList().then((data) => {
+      setLabelList(transformLabelList(data) as RouteModule.LabelList);
+    });
+  }, []);
+
+  return (
+    <Drawer
+      title="Edit labels"
+      placement="right"
+      width={512}
+      visible
+      closable
+      onClose={onClose}
+      footer={
+        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+          <Button onClick={onClose}>{formatMessage({ id: 'component.global.cancel' })}</Button>
+          <Button
+            type="primary"
+            style={{ marginRight: 8, marginLeft: 8 }}
+            onClick={(e) => {
+              e.persist();
+              form.validateFields().then(({ labels }) => {
+                const data = labels.map((item: any) => `${item.labelKey}:${item.labelValue}`)
+                // check for duplicates
+                if (new Set(data).size !== data.length) {
+                  notification.warning({
+                    message: `Config Error`,
+                    description: 'Please do not enter duplicate labels',
+                  });
+                  return;
+                }
+
+                onChange({
+                  action: 'labelsChange',
+                  data,
+                });
+                onClose();
+              });
+            }}
+          >
+            {formatMessage({ id: 'component.global.confirm' })}
+          </Button>
+        </div >
+      }
+    >
+      <Form form={form} layout="horizontal">
+        {LabelList(disabled, labelList || {})}
+      </Form>
+    </Drawer >
+  );
+};
+
+export default LabelsDrawer;

web/src/pages/Route/components/Step1/MetaView.tsx

@@ -14,17 +14,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React from 'react';
+import React, { useState } from 'react';
 import Form from 'antd/es/form';
-import { Input, Switch } from 'antd';
+import { Input, Switch, Select, Button, Tag } from 'antd';
 import { useIntl } from 'umi';
 import { PanelSection } from '@api7-dashboard/ui';
 
-const MetaView: React.FC<RouteModule.Step1PassProps> = ({ disabled, isEdit }) => {
+import { FORM_ITEM_WITHOUT_LABEL } from '@/pages/Route/constants';
+import LabelsDrawer from './LabelsDrawer';
+
+const MetaView: React.FC<RouteModule.Step1PassProps> = ({ disabled, form, isEdit, onChange, }) => {
   const { formatMessage } = useIntl();
+  const [visible, setVisible] = useState(false);
 
   return (
     <PanelSection title={formatMessage({ id: 'page.route.panelSection.title.nameDescription' })}>
+      {visible && (
+        <Form.Item shouldUpdate noStyle>
+          {() => {
+            if (form.getFieldValue('labels')) {
+              return (
+                <LabelsDrawer
+                  labelsDataSource={form.getFieldValue('labels')}
+                  disabled={disabled || false}
+                  onChange={onChange}
+                  onClose={() => setVisible(false)}
+                />
+              );
+            }
+            return null;
+          }}
+        </Form.Item>
+      )}
       <Form.Item
         label={formatMessage({ id: 'component.global.name' })}
         name="name"
@@ -49,6 +70,29 @@ const MetaView: React.FC<RouteModule.Step1PassProps> = ({ disabled, isEdit }) =>
           disabled={disabled}
         />
       </Form.Item>
+      <Form.Item label={formatMessage({ id: 'component.global.label' })} name="labels">
+        <Select
+          mode="tags"
+          style={{ width: '100%' }}
+          placeholder="--"
+          disabled={disabled}
+          open={false}
+          bordered={false}
+          tagRender={(props) => {
+            const { value, closable, onClose } = props;
+            return (
+              <Tag closable={closable && !disabled} onClose={onClose} style={{ marginRight: 3 }}>
+                {value}
+              </Tag>
+            );
+          }}
+        />
+      </Form.Item>
+      <Form.Item {...FORM_ITEM_WITHOUT_LABEL}>
+        <Button disabled={disabled} onClick={() => setVisible(true)}>
+          {formatMessage({ id: 'component.global.edit' })}
+        </Button>
+      </Form.Item>
       <Form.Item label={formatMessage({ id: 'component.global.description' })} name="desc">
         <Input.TextArea
           placeholder={formatMessage({ id: 'component.global.input.placeholder.description' })}

web/src/pages/Route/constants.ts

@@ -43,6 +43,7 @@ export const FORM_ITEM_WITHOUT_LABEL = {
 export const DEFAULT_STEP_1_DATA: RouteModule.Form1Data = {
   name: '',
   desc: '',
+  labels:[],
   status: 1,
   priority: 0,
   websocket: false,