This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 3b6ad19ea refactor(config-ui): use new ui input to replace input-group
(#6630)
3b6ad19ea is described below
commit 3b6ad19ea06db80a4c6cb48251502d61884e4ee8
Author: 青湛 <[email protected]>
AuthorDate: Thu Dec 14 16:50:32 2023 +1300
refactor(config-ui): use new ui input to replace input-group (#6630)
---
.../pages/blueprint/detail/components/sync-policy/index.tsx | 13 +++++++------
.../detail/components/update-name-dialog/index.tsx | 5 ++---
config-ui/src/pages/blueprint/home/index.tsx | 6 +++---
config-ui/src/pages/project/detail/settings-panel.tsx | 6 +++---
config-ui/src/pages/project/home/index.tsx | 6 +++---
.../plugins/components/connection-form/fields/app-id.tsx | 5 +++--
.../plugins/components/connection-form/fields/endpoint.tsx | 7 ++++---
.../src/plugins/components/connection-form/fields/name.tsx | 5 +++--
.../src/plugins/components/connection-form/fields/proxy.tsx | 5 +++--
.../plugins/components/connection-form/fields/username.tsx | 5 +++--
.../src/plugins/components/scope-config-form/index.tsx | 6 +++---
.../plugins/register/github/connection-fields/githubapp.tsx | 6 +++---
.../src/plugins/register/jira/connection-fields/auth.tsx | 8 ++++----
.../register/jira/transformation-fields/dev-panel.tsx | 12 ++++--------
.../register/jira/transformation-fields/remote-link.tsx | 5 ++---
config-ui/src/plugins/register/tapd/data-scope.tsx | 5 +++--
.../plugins/register/webhook/components/create-dialog.tsx | 6 +++---
.../src/plugins/register/webhook/components/edit-dialog.tsx | 5 ++---
.../plugins/register/zentao/connection-fields/db-url.tsx | 4 ++--
config-ui/src/routes/api-keys/api-keys.tsx | 8 ++++----
20 files changed, 64 insertions(+), 64 deletions(-)
diff --git
a/config-ui/src/pages/blueprint/detail/components/sync-policy/index.tsx
b/config-ui/src/pages/blueprint/detail/components/sync-policy/index.tsx
index 7289aa928..b3db24cc3 100644
--- a/config-ui/src/pages/blueprint/detail/components/sync-policy/index.tsx
+++ b/config-ui/src/pages/blueprint/detail/components/sync-policy/index.tsx
@@ -18,7 +18,8 @@
import { useState, useEffect, useMemo } from 'react';
import dayjs from 'dayjs';
-import { Tag, Checkbox, FormGroup, InputGroup, Radio, RadioGroup } from
'@blueprintjs/core';
+import { Input } from 'antd';
+import { Tag, Checkbox, FormGroup, Radio, RadioGroup } from
'@blueprintjs/core';
import { TimePrecision } from '@blueprintjs/datetime';
import { DateInput2 } from '@blueprintjs/datetime2';
@@ -148,31 +149,31 @@ export const SyncPolicy = ({
<>
<S.Input>
<FormGroup label="Minute">
- <InputGroup
+ <Input
value={mintue}
onChange={(e) => onChangeCronConfig([e.target.value, hour,
day, month, week].join(' '))}
/>
</FormGroup>
<FormGroup label="Hour">
- <InputGroup
+ <Input
value={hour}
onChange={(e) => onChangeCronConfig([mintue,
e.target.value, day, month, week].join(' '))}
/>
</FormGroup>
<FormGroup label="Day">
- <InputGroup
+ <Input
value={day}
onChange={(e) => onChangeCronConfig([mintue, hour,
e.target.value, month, week].join(' '))}
/>
</FormGroup>
<FormGroup label="Month">
- <InputGroup
+ <Input
value={month}
onChange={(e) => onChangeCronConfig([mintue, hour, day,
e.target.value, week].join(' '))}
/>
</FormGroup>
<FormGroup label="Week">
- <InputGroup
+ <Input
value={week}
onChange={(e) => onChangeCronConfig([mintue, hour, day,
month, e.target.value].join(' '))}
/>
diff --git
a/config-ui/src/pages/blueprint/detail/components/update-name-dialog/index.tsx
b/config-ui/src/pages/blueprint/detail/components/update-name-dialog/index.tsx
index a9c69dc7b..8914ed12e 100644
---
a/config-ui/src/pages/blueprint/detail/components/update-name-dialog/index.tsx
+++
b/config-ui/src/pages/blueprint/detail/components/update-name-dialog/index.tsx
@@ -17,8 +17,7 @@
*/
import { useState, useEffect } from 'react';
-import { Modal } from 'antd';
-import { InputGroup } from '@blueprintjs/core';
+import { Modal, Input } from 'antd';
interface Props {
name: string;
@@ -48,7 +47,7 @@ export const UpdateNameDialog = ({ operating, onCancel,
onSubmit, ...props }: Pr
>
<h3>Blueprint Name</h3>
<p>Give your Blueprint a unique name to help you identify it in the
future.</p>
- <InputGroup value={name} onChange={(e) => setName(e.target.value)} />
+ <Input value={name} onChange={(e) => setName(e.target.value)} />
</Modal>
);
};
diff --git a/config-ui/src/pages/blueprint/home/index.tsx
b/config-ui/src/pages/blueprint/home/index.tsx
index 44de6bbc9..5df40dd6f 100644
--- a/config-ui/src/pages/blueprint/home/index.tsx
+++ b/config-ui/src/pages/blueprint/home/index.tsx
@@ -19,8 +19,8 @@
import { useState, useMemo } from 'react';
import { Link } from 'react-router-dom';
import { PlusOutlined, SettingOutlined } from '@ant-design/icons';
-import { Flex, Table, Modal, Radio, Button } from 'antd';
-import { Tag, Intent, FormGroup, InputGroup } from '@blueprintjs/core';
+import { Flex, Table, Modal, Radio, Button, Input } from 'antd';
+import { Tag, Intent, FormGroup } from '@blueprintjs/core';
import dayjs from 'dayjs';
import API from '@/api';
@@ -235,7 +235,7 @@ export const BlueprintHomePage = () => {
}
labelInfo={<S.LabelInfo>*</S.LabelInfo>}
>
- <InputGroup
+ <Input
style={{ width: 386 }}
placeholder="Your Blueprint Name"
value={name}
diff --git a/config-ui/src/pages/project/detail/settings-panel.tsx
b/config-ui/src/pages/project/detail/settings-panel.tsx
index 98c99369e..07d724f49 100644
--- a/config-ui/src/pages/project/detail/settings-panel.tsx
+++ b/config-ui/src/pages/project/detail/settings-panel.tsx
@@ -18,8 +18,8 @@
import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
-import { Flex, Card, Modal, message } from 'antd';
-import { InputGroup, Checkbox, Button, Icon, Intent } from '@blueprintjs/core';
+import { Flex, Card, Modal, Input, message } from 'antd';
+import { Checkbox, Button, Icon, Intent } from '@blueprintjs/core';
import API from '@/api';
import { Block } from '@/components';
@@ -103,7 +103,7 @@ export const SettingsPanel = ({ project, onRefresh }:
Props) => {
<Flex vertical>
<Card>
<Block title="Project Name" description="Edit your project name with
letters, numbers, -, _ or /" required>
- <InputGroup style={{ width: 386 }} value={name} onChange={(e) =>
setName(e.target.value)} />
+ <Input style={{ width: 386 }} value={name} onChange={(e) =>
setName(e.target.value)} />
</Block>
<Block description="DORA metrics are four widely-adopted metrics for
measuring software delivery performance.">
<Checkbox
diff --git a/config-ui/src/pages/project/home/index.tsx
b/config-ui/src/pages/project/home/index.tsx
index 284cf368b..d8aa5c58f 100644
--- a/config-ui/src/pages/project/home/index.tsx
+++ b/config-ui/src/pages/project/home/index.tsx
@@ -19,8 +19,8 @@
import { useState, useMemo } from 'react';
import { Link, useNavigate } from 'react-router-dom';
import { PlusOutlined, SettingOutlined } from '@ant-design/icons';
-import { Table, Button, Modal, message } from 'antd';
-import { InputGroup, Checkbox, FormGroup } from '@blueprintjs/core';
+import { Table, Button, Modal, Input, message } from 'antd';
+import { Checkbox, FormGroup } from '@blueprintjs/core';
import dayjs from 'dayjs';
import API from '@/api';
@@ -229,7 +229,7 @@ export const ProjectHomePage = () => {
}
labelInfo={<S.LabelInfo>*</S.LabelInfo>}
>
- <InputGroup
+ <Input
style={{ width: 386 }}
placeholder="Your Project Name"
value={name}
diff --git a/config-ui/src/plugins/components/connection-form/fields/app-id.tsx
b/config-ui/src/plugins/components/connection-form/fields/app-id.tsx
index 8a38838aa..a5aec0c00 100644
--- a/config-ui/src/plugins/components/connection-form/fields/app-id.tsx
+++ b/config-ui/src/plugins/components/connection-form/fields/app-id.tsx
@@ -34,7 +34,8 @@
*/
import { useEffect } from 'react';
-import { FormGroup, InputGroup } from '@blueprintjs/core';
+import { Input } from 'antd';
+import { FormGroup } from '@blueprintjs/core';
import * as S from './styled';
@@ -69,7 +70,7 @@ export const ConnectionAppId = ({ label, subLabel,
placeholder, initialValue, va
labelInfo={<S.LabelInfo>*</S.LabelInfo>}
subLabel={subLabel ? <S.LabelDescription>{subLabel}</S.LabelDescription>
: null}
>
- <InputGroup placeholder={placeholder ?? 'Your AppId'} value={value}
onChange={handleChange} />
+ <Input placeholder={placeholder ?? 'Your AppId'} value={value}
onChange={handleChange} />
</FormGroup>
);
};
diff --git
a/config-ui/src/plugins/components/connection-form/fields/endpoint.tsx
b/config-ui/src/plugins/components/connection-form/fields/endpoint.tsx
index 4bbb2ab91..d52535b7b 100644
--- a/config-ui/src/plugins/components/connection-form/fields/endpoint.tsx
+++ b/config-ui/src/plugins/components/connection-form/fields/endpoint.tsx
@@ -34,7 +34,8 @@
*/
import { useState, useEffect } from 'react';
-import { FormGroup, RadioGroup, Radio, InputGroup } from '@blueprintjs/core';
+import { Input } from 'antd';
+import { FormGroup, RadioGroup, Radio } from '@blueprintjs/core';
import * as S from './styled';
@@ -114,7 +115,7 @@ export const ConnectionEndpoint = ({
</S.LabelDescription>
}
>
- <InputGroup placeholder="Your Endpoint URL" value={value}
onChange={handleChangeValue} />
+ <Input placeholder="Your Endpoint URL" value={value}
onChange={handleChangeValue} />
</FormGroup>
)}
</FormGroup>
@@ -127,7 +128,7 @@ export const ConnectionEndpoint = ({
labelInfo={<S.LabelInfo>*</S.LabelInfo>}
subLabel={<S.LabelDescription>{subLabel ?? `Provide the ${name} instance
API endpoint.`}</S.LabelDescription>}
>
- <InputGroup disabled={disabled} placeholder="Your Endpoint URL"
value={value} onChange={handleChangeValue} />
+ <Input disabled={disabled} placeholder="Your Endpoint URL" value={value}
onChange={handleChangeValue} />
</FormGroup>
);
};
diff --git a/config-ui/src/plugins/components/connection-form/fields/name.tsx
b/config-ui/src/plugins/components/connection-form/fields/name.tsx
index 282fc24ca..22f617e82 100644
--- a/config-ui/src/plugins/components/connection-form/fields/name.tsx
+++ b/config-ui/src/plugins/components/connection-form/fields/name.tsx
@@ -17,7 +17,8 @@
*/
import { useEffect } from 'react';
-import { FormGroup, InputGroup } from '@blueprintjs/core';
+import { Input } from 'antd';
+import { FormGroup } from '@blueprintjs/core';
import * as S from './styled';
@@ -53,7 +54,7 @@ export const ConnectionName = ({ initialValue, value,
setValue, setError }: Prop
</S.LabelDescription>
}
>
- <InputGroup placeholder="Your Connection Name" value={value}
onChange={handleChange} />
+ <Input placeholder="Your Connection Name" value={value}
onChange={handleChange} />
</FormGroup>
);
};
diff --git a/config-ui/src/plugins/components/connection-form/fields/proxy.tsx
b/config-ui/src/plugins/components/connection-form/fields/proxy.tsx
index f51d8223a..843613ece 100644
--- a/config-ui/src/plugins/components/connection-form/fields/proxy.tsx
+++ b/config-ui/src/plugins/components/connection-form/fields/proxy.tsx
@@ -34,7 +34,8 @@
*/
import { useEffect } from 'react';
-import { FormGroup, InputGroup } from '@blueprintjs/core';
+import { Input } from 'antd';
+import { FormGroup } from '@blueprintjs/core';
import * as S from './styled';
@@ -61,7 +62,7 @@ export const ConnectionProxy = ({ name, initialValue, value,
setValue }: Props)
label={<S.Label>Proxy URL</S.Label>}
subLabel={<S.LabelDescription>Add a proxy if you cannot access {name}
directly.</S.LabelDescription>}
>
- <InputGroup placeholder="e.g. http://proxy.localhost:8080"; value={value}
onChange={handleChange} />
+ <Input placeholder="e.g. http://proxy.localhost:8080"; value={value}
onChange={handleChange} />
</FormGroup>
);
};
diff --git
a/config-ui/src/plugins/components/connection-form/fields/username.tsx
b/config-ui/src/plugins/components/connection-form/fields/username.tsx
index 127e24be1..8086a1b27 100644
--- a/config-ui/src/plugins/components/connection-form/fields/username.tsx
+++ b/config-ui/src/plugins/components/connection-form/fields/username.tsx
@@ -34,7 +34,8 @@
*/
import { useEffect } from 'react';
-import { FormGroup, InputGroup } from '@blueprintjs/core';
+import { Input } from 'antd';
+import { FormGroup } from '@blueprintjs/core';
import * as S from './styled';
@@ -77,7 +78,7 @@ export const ConnectionUsername = ({
labelInfo={<S.LabelInfo>*</S.LabelInfo>}
subLabel={subLabel ? <S.LabelDescription>{subLabel}</S.LabelDescription>
: null}
>
- <InputGroup placeholder={placeholder ?? 'Your Username'} value={value}
onChange={handleChange} />
+ <Input placeholder={placeholder ?? 'Your Username'} value={value}
onChange={handleChange} />
</FormGroup>
);
};
diff --git a/config-ui/src/plugins/components/scope-config-form/index.tsx
b/config-ui/src/plugins/components/scope-config-form/index.tsx
index f804d2ea2..abb6c18db 100644
--- a/config-ui/src/plugins/components/scope-config-form/index.tsx
+++ b/config-ui/src/plugins/components/scope-config-form/index.tsx
@@ -18,8 +18,8 @@
import { useState, useEffect, useMemo } from 'react';
import { omit } from 'lodash';
-import { Flex, Form, Card, Alert, Divider } from 'antd';
-import { InputGroup, Button, Intent } from '@blueprintjs/core';
+import { Flex, Form, Input, Card, Alert, Divider } from 'antd';
+import { Button, Intent } from '@blueprintjs/core';
import API from '@/api';
import { ExternalLink, Block, MultiSelector, Message } from '@/components';
@@ -131,7 +131,7 @@ export const ScopeConfigForm = ({
description="Give this Scope Config a unique name so that you
can identify it in the future."
required
>
- <InputGroup placeholder="My Scope Config 1" value={name}
onChange={(e) => setName(e.target.value)} />
+ <Input placeholder="My Scope Config 1" value={name}
onChange={(e) => setName(e.target.value)} />
</Block>
</Card>
<Card>
diff --git
a/config-ui/src/plugins/register/github/connection-fields/githubapp.tsx
b/config-ui/src/plugins/register/github/connection-fields/githubapp.tsx
index 14c416577..ad2ab5464 100644
--- a/config-ui/src/plugins/register/github/connection-fields/githubapp.tsx
+++ b/config-ui/src/plugins/register/github/connection-fields/githubapp.tsx
@@ -17,8 +17,8 @@
*/
import { useEffect, useState } from 'react';
-import { Select } from 'antd';
-import { FormGroup, InputGroup, TextArea } from '@blueprintjs/core';
+import { Select, Input } from 'antd';
+import { FormGroup, TextArea } from '@blueprintjs/core';
import API from '@/api';
import { ExternalLink } from '@/components';
@@ -153,7 +153,7 @@ export const GithubApp = ({ endpoint, proxy, initialValue,
value, error, setValu
>
<S.Input>
<div className="input">
- <InputGroup
+ <Input
placeholder="App Id"
type="text"
value={settings.appId ?? ''}
diff --git a/config-ui/src/plugins/register/jira/connection-fields/auth.tsx
b/config-ui/src/plugins/register/jira/connection-fields/auth.tsx
index 2073051d3..9eeca505e 100644
--- a/config-ui/src/plugins/register/jira/connection-fields/auth.tsx
+++ b/config-ui/src/plugins/register/jira/connection-fields/auth.tsx
@@ -18,7 +18,7 @@
import { useState, useEffect } from 'react';
import { Input } from 'antd';
-import { FormGroup, RadioGroup, Radio, InputGroup } from '@blueprintjs/core';
+import { FormGroup, RadioGroup, Radio } from '@blueprintjs/core';
import { ExternalLink } from '@/components';
import { DOC_URL } from '@/release';
@@ -142,14 +142,14 @@ export const Auth = ({ initialValues, values, setValues,
setErrors }: Props) =>
</S.LabelDescription>
}
>
- <InputGroup placeholder="Your Endpoint URL" value={values.endpoint}
onChange={handleChangeEndpoint} />
+ <Input placeholder="Your Endpoint URL" value={values.endpoint}
onChange={handleChangeEndpoint} />
</FormGroup>
</FormGroup>
{version === 'cloud' && (
<>
<FormGroup label={<S.Label>E-Mail</S.Label>}
labelInfo={<S.LabelInfo>*</S.LabelInfo>}>
- <InputGroup placeholder="Your E-Mail" value={values.username}
onChange={handleChangeUsername} />
+ <Input placeholder="Your E-Mail" value={values.username}
onChange={handleChangeUsername} />
</FormGroup>
<FormGroup
label={<S.Label>API Token</S.Label>}
@@ -181,7 +181,7 @@ export const Auth = ({ initialValues, values, setValues,
setErrors }: Props) =>
{values.authMethod === 'BasicAuth' && (
<>
<FormGroup label={<S.Label>Username</S.Label>}
labelInfo={<S.LabelInfo>*</S.LabelInfo>}>
- <InputGroup placeholder="Your Username"
value={values.username} onChange={handleChangeUsername} />
+ <Input placeholder="Your Username" value={values.username}
onChange={handleChangeUsername} />
</FormGroup>
<FormGroup label={<S.Label>Password</S.Label>}
labelInfo={<S.LabelInfo>*</S.LabelInfo>}>
<Input.Password
diff --git
a/config-ui/src/plugins/register/jira/transformation-fields/dev-panel.tsx
b/config-ui/src/plugins/register/jira/transformation-fields/dev-panel.tsx
index 53f3867f2..690330e8b 100644
--- a/config-ui/src/plugins/register/jira/transformation-fields/dev-panel.tsx
+++ b/config-ui/src/plugins/register/jira/transformation-fields/dev-panel.tsx
@@ -17,8 +17,8 @@
*/
import { useEffect, useState } from 'react';
-import { Modal, message } from 'antd';
-import { InputGroup, Button, RadioGroup, Radio, Icon, Collapse } from
'@blueprintjs/core';
+import { Modal, Input, message } from 'antd';
+import { Button, RadioGroup, Radio, Icon, Collapse } from '@blueprintjs/core';
import API from '@/api';
import { Block } from '@/components';
@@ -149,11 +149,7 @@ export const DevPanel = ({ connectionId, transformation,
setTransformation, open
required
>
<div className="search">
- <InputGroup
- placeholder="Please enter..."
- value={issueKey}
- onChange={(e) => setIssueKey(e.target.value)}
- />
+ <Input placeholder="Please enter..." value={issueKey}
onChange={(e) => setIssueKey(e.target.value)} />
<Button loading={searching} disabled={!issueKey} text="See
Results" onClick={handleSearch} />
</div>
</Block>
@@ -197,7 +193,7 @@ export const DevPanel = ({ connectionId, transformation,
setTransformation, open
}
required
>
- <InputGroup
+ <Input
placeholder="eg.
https://gitlab.com/{namespace}/{repo_name}/commit/{commit_sha}";
value={pattern}
onChange={(e) => setPattern(e.target.value)}
diff --git
a/config-ui/src/plugins/register/jira/transformation-fields/remote-link.tsx
b/config-ui/src/plugins/register/jira/transformation-fields/remote-link.tsx
index 8b53c7109..145cafffa 100644
--- a/config-ui/src/plugins/register/jira/transformation-fields/remote-link.tsx
+++ b/config-ui/src/plugins/register/jira/transformation-fields/remote-link.tsx
@@ -18,8 +18,7 @@
import { useEffect, useState } from 'react';
import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
-import { InputGroup } from '@blueprintjs/core';
+import { Input, Button } from 'antd';
import { useDebounce } from 'ahooks';
import API from '@/api';
@@ -84,7 +83,7 @@ export const RemoteLink = ({ transformation,
setTransformation }: Props) => {
{links.map((link, i) => (
<div key={i} className="input">
<div className="inner">
- <InputGroup
+ <Input
key={i}
placeholder="E.g.
https://gitlab.com/{namespace}/{repo_name}/-/commit/{commit_sha}";
value={index === i ? pattern : link.pattern}
diff --git a/config-ui/src/plugins/register/tapd/data-scope.tsx
b/config-ui/src/plugins/register/tapd/data-scope.tsx
index f083001ef..cd801ba2b 100644
--- a/config-ui/src/plugins/register/tapd/data-scope.tsx
+++ b/config-ui/src/plugins/register/tapd/data-scope.tsx
@@ -17,7 +17,8 @@
*/
import { useEffect, useState } from 'react';
-import { Button, ControlGroup, InputGroup, Intent } from '@blueprintjs/core';
+import { Input } from 'antd';
+import { Button, ControlGroup, Intent } from '@blueprintjs/core';
import type { McsID, McsItem } from 'miller-columns-select';
import MillerColumnsSelect from 'miller-columns-select';
@@ -92,7 +93,7 @@ export const DataScope = ({ connectionId, disabledItems,
selectedItems, onChange
</ExternalLink>
<ControlGroup fill={false} vertical={false} style={{ padding: '8px 0' }}>
- <InputGroup
+ <Input
placeholder="Your company ID"
value={companyId}
style={{ width: 300 }}
diff --git
a/config-ui/src/plugins/register/webhook/components/create-dialog.tsx
b/config-ui/src/plugins/register/webhook/components/create-dialog.tsx
index 8b39923ae..c01637387 100644
--- a/config-ui/src/plugins/register/webhook/components/create-dialog.tsx
+++ b/config-ui/src/plugins/register/webhook/components/create-dialog.tsx
@@ -17,8 +17,8 @@
*/
import { useState, useMemo } from 'react';
-import { Modal } from 'antd';
-import { InputGroup, Icon } from '@blueprintjs/core';
+import { Modal, Input } from 'antd';
+import { Icon } from '@blueprintjs/core';
import { useAppDispatch } from '@/app/hook';
import { Block, CopyText, ExternalLink } from '@/components';
@@ -122,7 +122,7 @@ export const CreateDialog = ({ open, onCancel,
onSubmitAfter }: Props) => {
description="Give your Webhook a unique name to help you identify
it in the future."
required
>
- <InputGroup placeholder="Webhook Name" value={name} onChange={(e)
=> setName(e.target.value)} />
+ <Input placeholder="Webhook Name" value={name} onChange={(e) =>
setName(e.target.value)} />
</Block>
</S.Wrapper>
)}
diff --git a/config-ui/src/plugins/register/webhook/components/edit-dialog.tsx
b/config-ui/src/plugins/register/webhook/components/edit-dialog.tsx
index 91d441610..cef7bb72a 100644
--- a/config-ui/src/plugins/register/webhook/components/edit-dialog.tsx
+++ b/config-ui/src/plugins/register/webhook/components/edit-dialog.tsx
@@ -17,8 +17,7 @@
*/
import { useState, useEffect } from 'react';
-import { Modal } from 'antd';
-import { InputGroup } from '@blueprintjs/core';
+import { Modal, Input } from 'antd';
import { useAppDispatch, useAppSelector } from '@/app/hook';
import { Block } from '@/components';
@@ -66,7 +65,7 @@ export const EditDialog = ({ initialId, onCancel }: Props) =>
{
onOk={handleSubmit}
>
<Block title="Name" required>
- <InputGroup value={name} onChange={(e) => setName(e.target.value)} />
+ <Input value={name} onChange={(e) => setName(e.target.value)} />
</Block>
</Modal>
);
diff --git a/config-ui/src/plugins/register/zentao/connection-fields/db-url.tsx
b/config-ui/src/plugins/register/zentao/connection-fields/db-url.tsx
index c1e4195d4..67c3d23c0 100644
--- a/config-ui/src/plugins/register/zentao/connection-fields/db-url.tsx
+++ b/config-ui/src/plugins/register/zentao/connection-fields/db-url.tsx
@@ -17,7 +17,7 @@
*/
import { useEffect } from 'react';
-import { InputGroup } from '@blueprintjs/core';
+import { Input } from 'antd';
import { Block } from '@/components';
@@ -38,7 +38,7 @@ export const DBUrl = ({ initialValue, value, setValue }:
Props) => {
return (
<Block title="Database URL" description="Provide the DB URL of Zentao if
you want to collect issue changelogs.">
- <InputGroup
+ <Input
placeholder="e.g.
mysql://root:devlake@sshd-proxy:3306/zentao?charset=utf8mb4&parseTime=True"
value={value}
onChange={handleChange}
diff --git a/config-ui/src/routes/api-keys/api-keys.tsx
b/config-ui/src/routes/api-keys/api-keys.tsx
index 2d7f51fcf..252ac553f 100644
--- a/config-ui/src/routes/api-keys/api-keys.tsx
+++ b/config-ui/src/routes/api-keys/api-keys.tsx
@@ -17,8 +17,8 @@
*/
import { useState, useMemo } from 'react';
-import { Table, Modal } from 'antd';
-import { Button, Tag, Intent, InputGroup } from '@blueprintjs/core';
+import { Table, Modal, Input } from 'antd';
+import { Button, Tag, Intent } from '@blueprintjs/core';
import dayjs from 'dayjs';
import API from '@/api';
@@ -166,7 +166,7 @@ export const ApiKeys = () => {
onOk={handleSubmit}
>
<Block title="API Key Name" description="Give your API key a unique
name to identify in the future." required>
- <InputGroup
+ <Input
style={{ width: 386 }}
placeholder="My API Key"
value={form.name}
@@ -197,7 +197,7 @@ export const ApiKeys = () => {
>
<S.InputContainer>
<span>{prefix}</span>
- <InputGroup
+ <Input
placeholder=""
value={form.allowedPath}
onChange={(e) => setForm({ ...form, allowedPath:
e.target.value })}
