feat: membership add name

This commit is contained in:
2021-12-16 18:20:40 +07:00
parent c25ce840c7
commit 32c871afc3
3 changed files with 21 additions and 5 deletions

View File

@@ -106,8 +106,9 @@ export const Membership = observer(() => {
const columns = [
{
title: "Name",
dataIndex: "username",
key: "username",
dataIndex: "name",
key: "name",
render: (text, record) => record?.name ?? record?.username,
},
{
title: "Username",
@@ -138,7 +139,7 @@ export const Membership = observer(() => {
render: (text, record) => (
<Space size="middle">
<Button
type={record?.status === true ? "danger" : "primary"}
type={record?.isActive === true ? "danger" : "primary"}
onClick={() => changeStatus(record?.id, record?.isActive)}
>
{record?.isActive === true ? "Inactive" : "Active"}

View File

@@ -52,6 +52,15 @@ export const MembershipModal = ({
initialValues={initialData}
>
{((initialData.id && !initialData.isChangePassword) || !initialData.id) && (
<Form.Item
name="name"
label="Name"
rules={[{ required: true, message: "Please input Name!" }]}
>
<Input />
</Form.Item>
)}
{!initialData.id && (
<Form.Item
name="username"
label="Username"