diff --git a/src/client/index.ts b/src/client/index.ts index 8210506..e1c1970 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -9,7 +9,6 @@ export type { OpenAPIConfig } from './core/OpenAPI'; export type { AddUserRequest } from './models/AddUserRequest'; export type { AddUserResponse } from './models/AddUserResponse'; -export type { AssignmentSchema } from './models/AssignmentSchema'; export type { AuthLoginRequest } from './models/AuthLoginRequest'; export type { AuthLoginResponse } from './models/AuthLoginResponse'; export type { BarcodeAttributeSchema } from './models/BarcodeAttributeSchema'; @@ -108,6 +107,7 @@ export type { DealDeleteServiceRequest } from './models/DealDeleteServiceRequest export type { DealDeleteServiceResponse } from './models/DealDeleteServiceResponse'; export type { DealDeleteServicesRequest } from './models/DealDeleteServicesRequest'; export type { DealDeleteServicesResponse } from './models/DealDeleteServicesResponse'; +export type { DealEmployeesSchema } from './models/DealEmployeesSchema'; export type { DealGeneralInfoSchema } from './models/DealGeneralInfoSchema'; export type { DealGetAllResponse } from './models/DealGetAllResponse'; export type { DealGroupChangeStatusRequest } from './models/DealGroupChangeStatusRequest'; diff --git a/src/client/models/AssignmentSchema.ts b/src/client/models/DealEmployeesSchema.ts similarity index 86% rename from src/client/models/AssignmentSchema.ts rename to src/client/models/DealEmployeesSchema.ts index 7d1c13d..5ba3a15 100644 --- a/src/client/models/AssignmentSchema.ts +++ b/src/client/models/DealEmployeesSchema.ts @@ -3,7 +3,7 @@ /* tslint:disable */ /* eslint-disable */ import type { UserSchema } from './UserSchema'; -export type AssignmentSchema = { +export type DealEmployeesSchema = { user: UserSchema; createdAt: string; }; diff --git a/src/client/models/DealSchema.ts b/src/client/models/DealSchema.ts index f16299d..1af7cb3 100644 --- a/src/client/models/DealSchema.ts +++ b/src/client/models/DealSchema.ts @@ -2,10 +2,10 @@ /* istanbul ignore file */ /* tslint:disable */ /* eslint-disable */ -import type { AssignmentSchema } from './AssignmentSchema'; import type { BoxSchema } from './BoxSchema'; import type { ClientSchema } from './ClientSchema'; import type { DealBillRequestSchema } from './DealBillRequestSchema'; +import type { DealEmployeesSchema } from './DealEmployeesSchema'; import type { DealGroupSchema } from './DealGroupSchema'; import type { DealProductSchema } from './DealProductSchema'; import type { DealServiceSchema } from './DealServiceSchema'; @@ -35,7 +35,7 @@ export type DealSchema = { manager?: (UserSchema | null); pallets?: Array; boxes?: Array; - assignments?: Array; + employees?: Array; deliveryDate?: (string | null); receivingSlotDate?: (string | null); }; diff --git a/src/pages/LeadsPage/tabs/EmployeesTab/components/EmployeesTable.tsx b/src/pages/LeadsPage/tabs/EmployeesTab/components/EmployeesTable.tsx index 9927ca0..6e69ec3 100644 --- a/src/pages/LeadsPage/tabs/EmployeesTab/components/EmployeesTable.tsx +++ b/src/pages/LeadsPage/tabs/EmployeesTab/components/EmployeesTable.tsx @@ -4,7 +4,7 @@ import useEmployeeTableColumns from "../hooks/useEmployeesTableColumns.tsx"; import { ActionIcon, Flex, Tooltip } from "@mantine/core"; import { IconTrash } from "@tabler/icons-react"; import { MRT_TableOptions } from "mantine-react-table"; -import { AssignmentSchema } from "../../../../../client"; +import { DealEmployeesSchema } from "../../../../../client"; import useEmployeesTab from "../hooks/useEmployeesTab.tsx"; @@ -15,7 +15,7 @@ const EmployeesTable = () => { return ( { ), - } as MRT_TableOptions + } as MRT_TableOptions } /> ); diff --git a/src/pages/LeadsPage/tabs/EmployeesTab/hooks/useEmployeesTab.tsx b/src/pages/LeadsPage/tabs/EmployeesTab/hooks/useEmployeesTab.tsx index 7809ae7..923fc37 100644 --- a/src/pages/LeadsPage/tabs/EmployeesTab/hooks/useEmployeesTab.tsx +++ b/src/pages/LeadsPage/tabs/EmployeesTab/hooks/useEmployeesTab.tsx @@ -1,7 +1,7 @@ import { notifications } from "../../../../../shared/lib/notifications.ts"; import { modals } from "@mantine/modals"; import { useDealPageContext } from "../../../contexts/DealPageContext.tsx"; -import { AssignmentSchema, DealService } from "../../../../../client"; +import { DealEmployeesSchema, DealService } from "../../../../../client"; const useEmployeesTab = () => { const { selectedDeal: deal, refetchDeal } = useDealPageContext(); @@ -44,7 +44,7 @@ const useEmployeesTab = () => { }); }; - const onUnassignEmployeeClick = (assignment: AssignmentSchema) => { + const onUnassignEmployeeClick = (assignment: DealEmployeesSchema) => { if (!deal) return; manageEmployee(deal.id, assignment.user.id, false); }; diff --git a/src/pages/LeadsPage/tabs/EmployeesTab/hooks/useEmployeesTableColumns.tsx b/src/pages/LeadsPage/tabs/EmployeesTab/hooks/useEmployeesTableColumns.tsx index 4ee62f3..29c7075 100644 --- a/src/pages/LeadsPage/tabs/EmployeesTab/hooks/useEmployeesTableColumns.tsx +++ b/src/pages/LeadsPage/tabs/EmployeesTab/hooks/useEmployeesTableColumns.tsx @@ -1,10 +1,10 @@ import { useMemo } from "react"; import { MRT_ColumnDef } from "mantine-react-table"; -import { AssignmentSchema } from "../../../../../client"; +import { DealEmployeesSchema } from "../../../../../client"; const useEmployeeTableColumns = () => { - return useMemo[]>( + return useMemo[]>( () => [ { accessorKey: "createdAt",