refactor(typings): Refactor user and profile models; update API response types
This commit is contained in:
@@ -255,7 +255,7 @@ const ManagerDevicePage = () => {
|
||||
const offset = current === 1 ? 0 : (current - 1) * size;
|
||||
setIsLoading(true);
|
||||
|
||||
const metadata: Partial<MasterModel.ThingMetadata> = {};
|
||||
const metadata: Partial<MasterModel.SearchThingMetadata> = {};
|
||||
if (external_id) metadata.external_id = external_id;
|
||||
|
||||
// Add group filter if groups are selected
|
||||
|
||||
@@ -14,7 +14,7 @@ const SystemLogs = () => {
|
||||
const tableRef = useRef<ActionType>();
|
||||
const { token } = theme.useToken();
|
||||
|
||||
const queryUserSource = async (): Promise<MasterModel.ProfileResponse[]> => {
|
||||
const queryUserSource = async (): Promise<MasterModel.UserResponse[]> => {
|
||||
try {
|
||||
const body: MasterModel.SearchUserPaginationBody = {
|
||||
offset: 0,
|
||||
|
||||
@@ -14,7 +14,7 @@ enum AssignTabsKey {
|
||||
const AssignUserPage = () => {
|
||||
const { userId } = useParams<{ userId: string }>();
|
||||
const [userProfile, setUserProfile] =
|
||||
useState<MasterModel.ProfileResponse | null>(null);
|
||||
useState<MasterModel.UserResponse | null>(null);
|
||||
const [loading, setLoading] = useState<boolean>(false);
|
||||
const [tabSelected, setTabSelected] = useState<AssignTabsKey>(
|
||||
AssignTabsKey.group,
|
||||
|
||||
@@ -24,7 +24,7 @@ import {
|
||||
import { useRef, useState } from 'react';
|
||||
const { Text } = Typography;
|
||||
type AssignGroupProps = {
|
||||
user: MasterModel.ProfileResponse | null;
|
||||
user: MasterModel.UserResponse | null;
|
||||
};
|
||||
const AssignGroup = ({ user }: AssignGroupProps) => {
|
||||
const groupActionRef = useRef<ActionType>();
|
||||
|
||||
@@ -32,7 +32,7 @@ type PolicyShareDefault = {
|
||||
};
|
||||
|
||||
type ShareThingProps = {
|
||||
user: MasterModel.ProfileResponse | null;
|
||||
user: MasterModel.UserResponse | null;
|
||||
};
|
||||
const ShareThing = ({ user }: ShareThingProps) => {
|
||||
const listActionRef = useRef<ActionType>();
|
||||
|
||||
@@ -34,19 +34,19 @@ const ManagerUserPage = () => {
|
||||
const [isLoading, setIsLoading] = useState<boolean>(false);
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
const [selectedRowsState, setSelectedRowsState] = useState<
|
||||
MasterModel.ProfileResponse[]
|
||||
MasterModel.UserResponse[]
|
||||
>([]);
|
||||
|
||||
const [groupCheckedKeys, setGroupCheckedKeys] = useState<
|
||||
string | string[] | null
|
||||
>(null);
|
||||
|
||||
const handleClickAssign = (user: MasterModel.ProfileResponse) => {
|
||||
const handleClickAssign = (user: MasterModel.UserResponse) => {
|
||||
const path = `${ROUTE_MANAGER_USERS}/${user.id}/${ROUTE_MANAGER_USERS_PERMISSIONS}`;
|
||||
history.push(path);
|
||||
};
|
||||
|
||||
const columns: ProColumns<MasterModel.ProfileResponse>[] = [
|
||||
const columns: ProColumns<MasterModel.UserResponse>[] = [
|
||||
{
|
||||
key: 'email',
|
||||
title: (
|
||||
@@ -136,7 +136,7 @@ const ManagerUserPage = () => {
|
||||
},
|
||||
];
|
||||
|
||||
const handleRemove = async (selectedRows: MasterModel.ProfileResponse[]) => {
|
||||
const handleRemove = async (selectedRows: MasterModel.UserResponse[]) => {
|
||||
const key = 'remove_user';
|
||||
if (!selectedRows) return true;
|
||||
|
||||
@@ -151,7 +151,7 @@ const ManagerUserPage = () => {
|
||||
key,
|
||||
});
|
||||
const allDelete = selectedRows.map(
|
||||
async (row: MasterModel.ProfileResponse) => {
|
||||
async (row: MasterModel.UserResponse) => {
|
||||
await apiDeleteUser(row?.id || '');
|
||||
},
|
||||
);
|
||||
@@ -196,7 +196,7 @@ const ManagerUserPage = () => {
|
||||
/>
|
||||
</ProCard>
|
||||
<ProCard colSpan={{ xs: 24, sm: 24, md: 18, lg: 18, xl: 18 }}>
|
||||
<ProTable<MasterModel.ProfileResponse>
|
||||
<ProTable<MasterModel.UserResponse>
|
||||
columns={columns}
|
||||
tableLayout="auto"
|
||||
actionRef={actionRef}
|
||||
@@ -210,7 +210,7 @@ const ManagerUserPage = () => {
|
||||
selectedRowKeys: selectedRowsState.map((row) => row.id!),
|
||||
onChange: (
|
||||
_: React.Key[],
|
||||
selectedRows: MasterModel.ProfileResponse[],
|
||||
selectedRows: MasterModel.UserResponse[],
|
||||
) => {
|
||||
setSelectedRowsState(selectedRows);
|
||||
},
|
||||
@@ -249,12 +249,12 @@ const ManagerUserPage = () => {
|
||||
let users = userByGroupResponses.users || [];
|
||||
// Apply filters
|
||||
if (email) {
|
||||
users = users.filter((user: MasterModel.ProfileResponse) =>
|
||||
users = users.filter((user: MasterModel.UserResponse) =>
|
||||
user.email?.includes(email),
|
||||
);
|
||||
}
|
||||
if (phone_number) {
|
||||
users = users.filter((user: MasterModel.ProfileResponse) =>
|
||||
users = users.filter((user: MasterModel.UserResponse) =>
|
||||
user.metadata?.phone_number?.includes(phone_number),
|
||||
);
|
||||
}
|
||||
@@ -269,7 +269,7 @@ const ManagerUserPage = () => {
|
||||
};
|
||||
} else {
|
||||
// Use regular queryUsers API
|
||||
const metadata: Partial<MasterModel.ProfileMetadata> = {};
|
||||
const metadata: Partial<MasterModel.UserMetadata> = {};
|
||||
if (phone_number) metadata.phone_number = phone_number;
|
||||
|
||||
const query: MasterModel.SearchUserPaginationBody = {
|
||||
|
||||
Reference in New Issue
Block a user