diff --git a/src/app/global.css b/src/app/global.css index fd7fd83..9255a1d 100644 --- a/src/app/global.css +++ b/src/app/global.css @@ -15,6 +15,8 @@ --dark-thick-shadow: 1px 1px 13px 1px var(--mantine-color-dark-5); /* Heights */ --page-height: calc(100vh - (var(--mantine-spacing-md) * 2)); + --mobile-footer-height: 70px; + --mobile-page-height: calc(100vh - var(--mobile-footer-height)); } body { diff --git a/src/app/services/components/desktop/CreateServiceKitButton/CreateServiceKitButton.tsx b/src/app/services/components/desktop/CreateServiceKitButton/CreateServiceKitButton.tsx new file mode 100644 index 0000000..21a7512 --- /dev/null +++ b/src/app/services/components/desktop/CreateServiceKitButton/CreateServiceKitButton.tsx @@ -0,0 +1,27 @@ +import { FC } from "react"; +import { ButtonProps } from "@mantine/core"; +import { modals } from "@mantine/modals"; +import { useServicesContext } from "@/app/services/contexts/ServicesContext"; +import InlineButton from "@/components/ui/InlineButton/InlineButton"; + +type Props = ButtonProps; + +const CreateServiceKitButton: FC = () => { + const { servicesKitCrud } = useServicesContext(); + + const onCreateClick = () => { + modals.openContextModal({ + modal: "servicesKitEditorModal", + title: "Создание набора услуг", + withCloseButton: false, + innerProps: { + onCreate: servicesKitCrud.onCreate, + isEditing: false, + }, + }); + }; + + return Создать набор; +}; + +export default CreateServiceKitButton; diff --git a/src/app/services/components/desktop/ServicesDesktopHeader/ServicesDesktopHeader.tsx b/src/app/services/components/desktop/ServicesDesktopHeader/ServicesDesktopHeader.tsx new file mode 100644 index 0000000..587fa45 --- /dev/null +++ b/src/app/services/components/desktop/ServicesDesktopHeader/ServicesDesktopHeader.tsx @@ -0,0 +1,45 @@ +"use client"; + +import { FC } from "react"; +import { Box, Group } from "@mantine/core"; +import CreateServiceKitButton from "@/app/services/components/desktop/CreateServiceKitButton/CreateServiceKitButton"; +import ServiceTabSegmentedControl, { + ServicesTab, +} from "@/app/services/components/shared/ServiceTabSegmentedControl/ServiceTabSegmentedControl"; + +type Props = { + serviceTab: ServicesTab; + onServiceTabChange: (serviceTab: ServicesTab) => void; +}; + +const ServicesDesktopHeader: FC = ({ + serviceTab, + onServiceTabChange, +}) => { + const getTabActions = () => { + switch (serviceTab) { + case ServicesTab.DEAL_SERVICE: + return ; + case ServicesTab.PRODUCT_SERVICE: + return ; + case ServicesTab.SERVICES_KITS: + return ; + default: + return ; + } + }; + + return ( + + {getTabActions()} + onServiceTabChange(Number(tab))} + /> + + ); +}; + +export default ServicesDesktopHeader; diff --git a/src/app/services/components/mobile/ServicesMobileHeader/ServicesMobileHeader.tsx b/src/app/services/components/mobile/ServicesMobileHeader/ServicesMobileHeader.tsx new file mode 100644 index 0000000..7463d15 --- /dev/null +++ b/src/app/services/components/mobile/ServicesMobileHeader/ServicesMobileHeader.tsx @@ -0,0 +1,28 @@ +"use client"; + +import { FC } from "react"; +import ServiceTabSegmentedControl, { + ServicesTab, +} from "@/app/services/components/shared/ServiceTabSegmentedControl/ServiceTabSegmentedControl"; + +type Props = { + serviceTab: ServicesTab; + onServiceTabChange: (serviceTab: ServicesTab) => void; +}; + +const ServicesMobileHeader: FC = ({ + serviceTab, + onServiceTabChange, +}) => { + return ( + onServiceTabChange(Number(tab))} + w={"100%"} + py={"md"} + px={"sm"} + /> + ); +}; + +export default ServicesMobileHeader; diff --git a/src/app/services/components/shared/PageBody/PageBody.tsx b/src/app/services/components/shared/PageBody/PageBody.tsx new file mode 100644 index 0000000..63bb566 --- /dev/null +++ b/src/app/services/components/shared/PageBody/PageBody.tsx @@ -0,0 +1,63 @@ +"use client"; + +import { useState } from "react"; +import ServicesDesktopHeader from "@/app/services/components/desktop/ServicesDesktopHeader/ServicesDesktopHeader"; +import ServicesMobileHeader from "@/app/services/components/mobile/ServicesMobileHeader/ServicesMobileHeader"; +import ServicesKitsTable from "@/app/services/components/shared/ServicesKitTable/ServicesKitTable"; +import { ServicesTab } from "@/app/services/components/shared/ServiceTabSegmentedControl/ServiceTabSegmentedControl"; +import PageBlock from "@/components/layout/PageBlock/PageBlock"; +import useIsMobile from "@/hooks/utils/useIsMobile"; + +const PageBody = () => { + const isMobile = useIsMobile(); + + const [servicesTab, setServicesTab] = useState( + ServicesTab.PRODUCT_SERVICE + ); + + const getPageBody = () => { + switch (servicesTab) { + case ServicesTab.PRODUCT_SERVICE: + return <>; + case ServicesTab.DEAL_SERVICE: + return <>; + case ServicesTab.SERVICES_KITS: + return ; + default: + return <>-; + } + }; + + return ( + <> + {!isMobile && ( + + + + )} + +
+ {isMobile && ( + + )} +
+ {getPageBody()} +
+
+ + + ); +}; + +export default PageBody; diff --git a/src/app/services/components/shared/ServiceTabSegmentedControl/ServiceTabSegmentedControl.tsx b/src/app/services/components/shared/ServiceTabSegmentedControl/ServiceTabSegmentedControl.tsx new file mode 100644 index 0000000..4192d95 --- /dev/null +++ b/src/app/services/components/shared/ServiceTabSegmentedControl/ServiceTabSegmentedControl.tsx @@ -0,0 +1,34 @@ +import { FC } from "react"; +import { SegmentedControl, SegmentedControlProps } from "@mantine/core"; + +export enum ServicesTab { + DEAL_SERVICE, + PRODUCT_SERVICE, + SERVICES_KITS, +} + +type Props = Omit; + +const data = [ + { + label: "Для товара", + value: ServicesTab.PRODUCT_SERVICE.toString(), + }, + { + label: "Для сделки", + value: ServicesTab.DEAL_SERVICE.toString(), + }, + { + label: "Наборы услуг", + value: ServicesTab.SERVICES_KITS.toString(), + }, +]; + +const ServiceTabSegmentedControl: FC = props => ( + +); + +export default ServiceTabSegmentedControl; diff --git a/src/app/services/components/shared/ServiceTypeSegmentedControl/ServiceTypeSegmentedControl.tsx b/src/app/services/components/shared/ServiceTypeSegmentedControl/ServiceTypeSegmentedControl.tsx new file mode 100644 index 0000000..ceb64ea --- /dev/null +++ b/src/app/services/components/shared/ServiceTypeSegmentedControl/ServiceTypeSegmentedControl.tsx @@ -0,0 +1,25 @@ +import { FC } from "react"; +import { SegmentedControl, SegmentedControlProps } from "@mantine/core"; +import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBase/shared/types/service"; + +type Props = Omit; + +const data = [ + { + label: "Для сделки", + value: ServiceType.DEAL_SERVICE.toString(), + }, + { + label: "Для товара", + value: ServiceType.PRODUCT_SERVICE.toString(), + }, +]; + +const ServiceTypeSegmentedControl: FC = props => ( + +); + +export default ServiceTypeSegmentedControl; diff --git a/src/app/services/components/shared/ServicesKitTable/ServicesKitTable.tsx b/src/app/services/components/shared/ServicesKitTable/ServicesKitTable.tsx new file mode 100644 index 0000000..06191e5 --- /dev/null +++ b/src/app/services/components/shared/ServicesKitTable/ServicesKitTable.tsx @@ -0,0 +1,42 @@ +import { modals } from "@mantine/modals"; +import useServicesKitsTableColumns from "@/app/services/components/shared/ServicesKitTable/hooks/useServicesKitsTableColumns"; +import { useServicesContext } from "@/app/services/contexts/ServicesContext"; +import BaseTable from "@/components/ui/BaseTable/BaseTable"; +import useIsMobile from "@/hooks/utils/useIsMobile"; +import { ServicesKitSchema } from "@/lib/client"; + +const ServicesKitsTable = () => { + const { servicesKitCrud, servicesKitList } = useServicesContext(); + const isMobile = useIsMobile(); + + const onChange = (kit: ServicesKitSchema) => { + modals.openContextModal({ + modal: "servicesKitEditorModal", + title: "Редактирование набора услуг", + withCloseButton: false, + innerProps: { + entity: kit, + onChange: value => servicesKitCrud.onUpdate(kit.id, value), + isEditing: true, + }, + }); + }; + + const columns = useServicesKitsTableColumns({ + onChange, + onDelete: servicesKitCrud.onDelete, + }); + + return ( + + ); +}; + +export default ServicesKitsTable; diff --git a/src/app/services/components/shared/ServicesKitTable/hooks/useServicesKitsTableColumns.tsx b/src/app/services/components/shared/ServicesKitTable/hooks/useServicesKitsTableColumns.tsx new file mode 100644 index 0000000..22f216f --- /dev/null +++ b/src/app/services/components/shared/ServicesKitTable/hooks/useServicesKitsTableColumns.tsx @@ -0,0 +1,68 @@ +import { useMemo } from "react"; +import { IconEdit, IconTrash } from "@tabler/icons-react"; +import { DataTableColumn } from "mantine-datatable"; +import { Flex } from "@mantine/core"; +import ActionIconWithTip from "@/components/ui/ActionIconWithTip/ActionIconWithTip"; +import useIsMobile from "@/hooks/utils/useIsMobile"; +import { ServicesKitSchema } from "@/lib/client"; +import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBase/shared/types/service"; + +type Props = { + onChange: (kit: ServicesKitSchema) => void; + onDelete: (kit: ServicesKitSchema) => void; +}; + +const useServicesKitsTableColumns = ({ onDelete, onChange }: Props) => { + const isMobile = useIsMobile(); + + return useMemo( + () => + [ + { + accessor: "actions", + title: "Действия", + sortable: false, + textAlign: "center", + width: "0%", + render: kit => ( + + onChange(kit)} + tipLabel={"Редактировать"}> + + + onDelete(kit)} + tipLabel={"Удалить"}> + + + + ), + }, + { + accessor: "name", + title: "Название", + width: "60%", + }, + { + title: "Кол-во услуг", + accessor: "services", + render: kit => kit.services.length, + width: "20%", + }, + { + title: "Тип набора", + accessor: "serviceType", + render: kit => + kit.serviceType === ServiceType.DEAL_SERVICE + ? "Для сделок" + : "Для товаров", + width: "20%", + }, + ] as DataTableColumn[], + [] + ); +}; + +export default useServicesKitsTableColumns; diff --git a/src/app/services/components/shared/ServicesMultiselect/ServicesMultiselect.tsx b/src/app/services/components/shared/ServicesMultiselect/ServicesMultiselect.tsx new file mode 100644 index 0000000..98169b5 --- /dev/null +++ b/src/app/services/components/shared/ServicesMultiselect/ServicesMultiselect.tsx @@ -0,0 +1,24 @@ +"use client"; + +import { FC } from "react"; +import ObjectMultiSelect, { + ObjectMultiSelectProps, +} from "@/components/selects/ObjectMultiSelect/ObjectMultiSelect"; +import { ServiceSchema } from "@/lib/client"; +import useServicesList from "@/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesList"; + +type Props = Omit, "data">; + +const ServicesMultiselect: FC = (props: Props) => { + const { services } = useServicesList(); + + return ( + + ); +}; + +export default ServicesMultiselect; diff --git a/src/app/services/contexts/ServicesContext.tsx b/src/app/services/contexts/ServicesContext.tsx new file mode 100644 index 0000000..583a94a --- /dev/null +++ b/src/app/services/contexts/ServicesContext.tsx @@ -0,0 +1,45 @@ +"use client"; + +import makeContext from "@/lib/contextFactory/contextFactory"; +import { + ServicesCrud, + useServicesCrud, +} from "@/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/cruds/useServicesCrud"; +import { + ServicesKitsCrud, + useServicesKitsCrud, +} from "@/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/cruds/useServicesKitsCrud"; +import useServicesKitsList, { + ServicesKitsList, +} from "@/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesKitsList"; +import useServicesList, { + ServicesList, +} from "@/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesList"; + +type ServicesContextState = { + servicesList: ServicesList; + servicesCrud: ServicesCrud; + servicesKitList: ServicesKitsList; + servicesKitCrud: ServicesKitsCrud; +}; + +const useFulfillmentBaseContextState = (): ServicesContextState => { + const servicesList = useServicesList(); + const servicesCrud = useServicesCrud(servicesList); + + const servicesKitList = useServicesKitsList(); + const servicesKitCrud = useServicesKitsCrud(servicesKitList); + + return { + servicesList, + servicesCrud, + servicesKitList, + servicesKitCrud, + }; +}; + +export const [ServicesContextProvider, useServicesContext] = + makeContext( + useFulfillmentBaseContextState, + "Services" + ); diff --git a/src/app/services/modals/ServicesKitEditorModal.tsx b/src/app/services/modals/ServicesKitEditorModal.tsx new file mode 100644 index 0000000..dbadd42 --- /dev/null +++ b/src/app/services/modals/ServicesKitEditorModal.tsx @@ -0,0 +1,70 @@ +"use client"; + +import { TextInput } from "@mantine/core"; +import { useForm } from "@mantine/form"; +import { ContextModalProps } from "@mantine/modals"; +import ServicesMultiselect from "@/app/services/components/shared/ServicesMultiselect/ServicesMultiselect"; +import ServiceTypeSegmentedControl from "@/app/services/components/shared/ServiceTypeSegmentedControl/ServiceTypeSegmentedControl"; +import { ServicesKitSchema } from "@/lib/client"; +import BaseFormModal, { + CreateEditFormProps, +} from "@/modals/base/BaseFormModal/BaseFormModal"; +import { ServiceType } from "@/modules/dealModularEditorTabs/FulfillmentBase/shared/types/service"; + +type Props = CreateEditFormProps; + +const ServicesKitEditorModal = ({ + context, + id, + innerProps, +}: ContextModalProps) => { + const initialValues: Partial = innerProps.isEditing + ? innerProps.entity + : { + name: "", + serviceType: ServiceType.DEAL_SERVICE, + services: [], + }; + + const form = useForm>({ + initialValues, + validate: { + name: name => !name && "Введите название", + services: services => + (!services || services.length === 0) && "Выберите услуги", + }, + }); + + return ( + context.closeContextModal(id)}> + + { + form.setFieldValue("serviceType", Number(tab)); + form.setFieldValue("services", []); + }} + mt={"xs"} + /> + + service.serviceType === form.values.serviceType + } + groupBy={service => service.category.name} + {...form.getInputProps("services")} + /> + + ); +}; + +export default ServicesKitEditorModal; diff --git a/src/app/services/modals/index.ts b/src/app/services/modals/index.ts new file mode 100644 index 0000000..3449ca5 --- /dev/null +++ b/src/app/services/modals/index.ts @@ -0,0 +1 @@ +export { default as ServicesKitEditorModal } from "@/app/services/modals/ServicesKitEditorModal"; diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx new file mode 100644 index 0000000..2839eab --- /dev/null +++ b/src/app/services/page.tsx @@ -0,0 +1,22 @@ +import { Suspense } from "react"; +import { Center, Loader } from "@mantine/core"; +import PageBody from "@/app/services/components/shared/PageBody/PageBody"; +import { ServicesContextProvider } from "@/app/services/contexts/ServicesContext"; +import PageContainer from "@/components/layout/PageContainer/PageContainer"; + +export default async function ServicesPage() { + return ( + + + + }> + + + + + + + ); +} diff --git a/src/components/layout/Footer/Footer.module.css b/src/components/layout/Footer/Footer.module.css index 40513d0..9a6508f 100644 --- a/src/components/layout/Footer/Footer.module.css +++ b/src/components/layout/Footer/Footer.module.css @@ -1,4 +1,6 @@ .container { + height: var(--mobile-footer-height); + @mixin light { border-top: solid gray 2px; } @@ -9,7 +11,6 @@ .link { width: 100%; - height: rem(50px); border-radius: var(--mantine-radius-md); display: flex; align-items: center; diff --git a/src/components/layout/Navbar/Navbar.tsx b/src/components/layout/Navbar/Navbar.tsx index ced75da..af8da46 100644 --- a/src/components/layout/Navbar/Navbar.tsx +++ b/src/components/layout/Navbar/Navbar.tsx @@ -1,4 +1,4 @@ -import { IconCircleDotted, IconLayoutKanban } from "@tabler/icons-react"; +import { IconColumns, IconLayoutKanban } from "@tabler/icons-react"; import { Box, Flex } from "@mantine/core"; import PageBlock from "@/components/layout/PageBlock/PageBlock"; import { ColorSchemeToggle } from "@/components/ui/ColorSchemeToggle/ColorSchemeToggle"; @@ -13,9 +13,9 @@ const linksData = [ href: "/deals", }, { - icon: IconCircleDotted, - label: "Назад", - href: "/oiiai", + icon: IconColumns, + label: "Услуги", + href: "/services", }, ]; diff --git a/src/components/layout/PageBlock/PageBlock.module.css b/src/components/layout/PageBlock/PageBlock.module.css index 7f23f50..2136cf0 100644 --- a/src/components/layout/PageBlock/PageBlock.module.css +++ b/src/components/layout/PageBlock/PageBlock.module.css @@ -20,6 +20,10 @@ .container-full-height { height: var(--page-height); + + @media (max-width: 48em) { + height: var(--mobile-page-height); + } } .container-no-border-radius { @@ -28,8 +32,8 @@ .container-full-screen-mobile { @media (max-width: 48em) { - min-height: 100vh; - height: 100vh; + min-height: var(--mobile-page-height); + height: var(--mobile-page-height); width: 100vw; border-radius: 0 !important; position: fixed; diff --git a/src/components/selects/ObjectMultiSelect/ObjectMultiSelect.tsx b/src/components/selects/ObjectMultiSelect/ObjectMultiSelect.tsx index 41f6a6e..4ae1a05 100644 --- a/src/components/selects/ObjectMultiSelect/ObjectMultiSelect.tsx +++ b/src/components/selects/ObjectMultiSelect/ObjectMultiSelect.tsx @@ -93,7 +93,13 @@ const ObjectMultiSelect = (props: ObjectMultiSelectProps) => { props.onChange(internalValue); }, [internalValue]); - const restProps = omit(props, "getValueFn", "getLabelFn", "filterBy"); + const restProps = omit( + props, + "getValueFn", + "getLabelFn", + "filterBy", + "groupBy" + ); return ( & { @@ -15,20 +16,24 @@ const ActionIconWithTip: FC> = ({ children, tipLabel, ...props -}) => ( - -); +}) => { + const isMobile = useIsMobile(); + + return ( + + ); +}; export default ActionIconWithTip; diff --git a/src/components/ui/BaseTable/BaseTable.module.css b/src/components/ui/BaseTable/BaseTable.module.css index b300c60..51d9e14 100644 --- a/src/components/ui/BaseTable/BaseTable.module.css +++ b/src/components/ui/BaseTable/BaseTable.module.css @@ -1,4 +1,13 @@ +.table-bg { + @mixin light { + background-color: white; + } + @mixin dark { + background-color: var(--mantine-color-dark-8); + } +} + .table-border { border-width: 1px; border-radius: var(--mantine-radius-lg); diff --git a/src/components/ui/BaseTable/BaseTable.tsx b/src/components/ui/BaseTable/BaseTable.tsx index 3970f75..470a318 100644 --- a/src/components/ui/BaseTable/BaseTable.tsx +++ b/src/components/ui/BaseTable/BaseTable.tsx @@ -9,7 +9,12 @@ function BaseTable(props: DataTableProps) { withRowBorders striped={false} verticalAlign={"center"} - backgroundColor={"transparent"} + classNames={{ + root: styles["table-bg"], + table: styles["table-bg"], + header: styles["table-bg"], + footer: styles["table-bg"], + }} className={classNames( props.withTableBorder && styles["table-border"] )} diff --git a/src/lib/client/types.gen.ts b/src/lib/client/types.gen.ts index d552490..fa2f604 100644 --- a/src/lib/client/types.gen.ts +++ b/src/lib/client/types.gen.ts @@ -90,6 +90,10 @@ export type BuiltInModuleTabSchema = { * Id */ id: number; + /** + * Key + */ + key: string; /** * Label */ @@ -468,9 +472,9 @@ export type CreateServicesKitSchema = { */ serviceType: number; /** - * Servicesids + * Services */ - servicesIds: Array; + services: Array; }; /** @@ -1487,9 +1491,9 @@ export type UpdateServicesKitSchema = { */ serviceType: number; /** - * Servicesids + * Services */ - servicesIds: Array; + services: Array; }; /** diff --git a/src/lib/client/zod.gen.ts b/src/lib/client/zod.gen.ts index f75c455..8957a33 100644 --- a/src/lib/client/zod.gen.ts +++ b/src/lib/client/zod.gen.ts @@ -17,6 +17,7 @@ export const zBoardSchema = z.object({ */ export const zBuiltInModuleTabSchema = z.object({ id: z.int(), + key: z.string(), label: z.string(), iconName: z.string(), device: z.string(), @@ -385,7 +386,7 @@ export const zCreateServiceResponse = z.object({ export const zCreateServicesKitSchema = z.object({ name: z.string(), serviceType: z.int(), - servicesIds: z.array(z.int()), + services: z.array(zServiceSchema), }); /** @@ -878,7 +879,7 @@ export const zUpdateServiceResponse = z.object({ export const zUpdateServicesKitSchema = z.object({ name: z.string(), serviceType: z.int(), - servicesIds: z.array(z.int()), + services: z.array(zServiceSchema), }); /** diff --git a/src/modals/modals.ts b/src/modals/modals.ts index 97ed8f6..7be14d6 100644 --- a/src/modals/modals.ts +++ b/src/modals/modals.ts @@ -1,6 +1,7 @@ import DealsBoardFiltersModal from "@/app/deals/modals/DealsBoardFiltersModal/DealsBoardFiltersModal"; import DealsScheduleFiltersModal from "@/app/deals/modals/DealsScheduleFiltersModal/DealsScheduleFiltersModal"; import DealsTableFiltersModal from "@/app/deals/modals/DealsTableFiltersModal/DealsTableFiltersModal"; +import { ServicesKitEditorModal } from "@/app/services/modals"; import EnterNameModal from "@/modals/EnterNameModal/EnterNameModal"; import { DealProductEditorModal, @@ -22,4 +23,5 @@ export const modals = { productServiceEditorModal: ProductServiceEditorModal, duplicateServicesModal: DuplicateServicesModal, servicesKitSelectModal: ServicesKitSelectModal, + servicesKitEditorModal: ServicesKitEditorModal, }; diff --git a/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/cruds/useServicesKitsCrud.tsx b/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/cruds/useServicesKitsCrud.tsx new file mode 100644 index 0000000..6c44d33 --- /dev/null +++ b/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/cruds/useServicesKitsCrud.tsx @@ -0,0 +1,51 @@ +import { useCrudOperations } from "@/hooks/cruds/baseCrud"; +import { + CreateServicesKitSchema, + ServicesKitSchema, + UpdateServicesKitSchema, +} from "@/lib/client"; +import { + createServicesKitMutation, + deleteServicesKitMutation, + updateServicesKitMutation, +} from "@/lib/client/@tanstack/react-query.gen"; + +type Props = { + queryKey: any[]; +}; + +export type ServicesKitsCrud = { + onCreate: (data: Partial) => void; + onUpdate: ( + servicesKitId: number, + servicesKit: UpdateServicesKitSchema + ) => void; + onDelete: (servicesKit: ServicesKitSchema, onSuccess?: () => void) => void; +}; + +export const useServicesKitsCrud = ({ queryKey }: Props): ServicesKitsCrud => { + return useCrudOperations< + ServicesKitSchema, + UpdateServicesKitSchema, + CreateServicesKitSchema + >({ + key: "getServicesKits", + queryKey, + mutations: { + create: createServicesKitMutation(), + update: updateServicesKitMutation(), + delete: deleteServicesKitMutation(), + }, + getCreateEntity: data => ({ + name: data.name!, + serviceType: data.serviceType!, + services: data.services!, + }), + getUpdateEntity: (old, update) => ({ + ...old, + name: update.name ?? old.name, + serviceType: update.serviceType ?? old.serviceType, + }), + getDeleteConfirmTitle: () => "Удаление набора услуг", + }); +}; diff --git a/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesKitsList.ts b/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesKitsList.ts index 8ae5923..6e8c9e1 100644 --- a/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesKitsList.ts +++ b/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesKitsList.ts @@ -5,7 +5,15 @@ import { getServicesKitsQueryKey, } from "@/lib/client/@tanstack/react-query.gen"; -const useServicesKitsList = () => { +export type ServicesKitsList = { + servicesKits: ServicesKitSchema[]; + setServicesKits: (servicesKits: ServicesKitSchema[]) => void; + refetch: () => void; + queryKey: any[]; + isLoading: boolean; +}; + +const useServicesKitsList = (): ServicesKitsList => { const queryClient = useQueryClient(); const { data, refetch, isLoading } = useQuery(getServicesKitsOptions()); diff --git a/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesList.ts b/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesList.ts index 8994b47..835b038 100644 --- a/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesList.ts +++ b/src/modules/dealModularEditorTabs/FulfillmentBase/shared/hooks/lists/useServicesList.ts @@ -5,8 +5,15 @@ import { getServicesQueryKey, } from "@/lib/client/@tanstack/react-query.gen"; +export type ServicesList = { + services: ServiceSchema[]; + setServices: (services: ServiceSchema[]) => void; + refetch: () => void; + queryKey: any[]; + isLoading: boolean; +}; -const useServicesList = () => { +const useServicesList = (): ServicesList => { const queryClient = useQueryClient(); const { data, refetch, isLoading } = useQuery(getServicesOptions()); diff --git a/src/theme.ts b/src/theme.ts index 483d74e..63ab1bc 100644 --- a/src/theme.ts +++ b/src/theme.ts @@ -62,5 +62,15 @@ export const theme = createTheme({ decimalSeparator: ",", }, }, + MultiSelect: { + defaultProps: { + radius, + }, + }, + SegmentedControl: { + defaultProps: { + radius, + }, + }, }, });