-
Notifications
You must be signed in to change notification settings - Fork 542
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: added route label search * fix: react key warning * feat: add label drawer * feat: add save and cancel button in drawer * feat: added edit feature in labelDrawer * fix: lost click event when div child is empty * feat: update route transform with labels * feat: add AutoComplete * feat: use form.list render labels * feat: clean code * fix: warning when click save button * feat: update fetchLabelList * feat: update create route * feat: update typing * Merge branch master into feat-route-group-1 * Update component.ts * feat: update code * feat: update i18n Co-authored-by: 琚致远 <[email protected]>
- Loading branch information
Showing
10 changed files
with
349 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| /* | ||
| * 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 { 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(setLabelList); | ||
| }, []); | ||
|
|
||
| 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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.