feat: removed price categories

src/client/index.ts

@@ -77,8 +77,6 @@ export type { CreatePayRateRequest } from './models/CreatePayRateRequest';
 export type { CreatePayRateResponse } from './models/CreatePayRateResponse';
 export type { CreatePositionRequest } from './models/CreatePositionRequest';
 export type { CreatePositionResponse } from './models/CreatePositionResponse';
-export type { CreatePriceCategoryRequest } from './models/CreatePriceCategoryRequest';
-export type { CreatePriceCategoryResponse } from './models/CreatePriceCategoryResponse';
 export type { CreateProjectRequest } from './models/CreateProjectRequest';
 export type { CreateProjectResponse } from './models/CreateProjectResponse';
 export type { CreateResidualBoxRequest } from './models/CreateResidualBoxRequest';
@@ -180,8 +178,6 @@ export type { DeletePayRateRequest } from './models/DeletePayRateRequest';
 export type { DeletePayRateResponse } from './models/DeletePayRateResponse';
 export type { DeletePositionRequest } from './models/DeletePositionRequest';
 export type { DeletePositionResponse } from './models/DeletePositionResponse';
-export type { DeletePriceCategoryRequest } from './models/DeletePriceCategoryRequest';
-export type { DeletePriceCategoryResponse } from './models/DeletePriceCategoryResponse';
 export type { DeleteProjectResponse } from './models/DeleteProjectResponse';
 export type { DeleteResidualBoxResponse } from './models/DeleteResidualBoxResponse';
 export type { DeleteResidualPalletResponse } from './models/DeleteResidualPalletResponse';
@@ -211,7 +207,6 @@ export type { GetAllBaseMarketplacesResponse } from './models/GetAllBaseMarketpl
 export type { GetAllPayRatesResponse } from './models/GetAllPayRatesResponse';
 export type { GetAllPayrollSchemeResponse } from './models/GetAllPayrollSchemeResponse';
 export type { GetAllPositionsResponse } from './models/GetAllPositionsResponse';
-export type { GetAllPriceCategoriesResponse } from './models/GetAllPriceCategoriesResponse';
 export type { GetAllRolesResponse } from './models/GetAllRolesResponse';
 export type { GetAllServicesKitsResponse } from './models/GetAllServicesKitsResponse';
 export type { GetAllShippingWarehousesResponse } from './models/GetAllShippingWarehousesResponse';
@@ -307,7 +302,6 @@ export type { ResidualBoxSchema } from './models/ResidualBoxSchema';
 export type { ResidualPalletSchema } from './models/ResidualPalletSchema';
 export type { ResidualProductSchema } from './models/ResidualProductSchema';
 export type { RoleSchema } from './models/RoleSchema';
-export type { ServiceCategoryPriceSchema } from './models/ServiceCategoryPriceSchema';
 export type { ServiceCategoryReorderRequest } from './models/ServiceCategoryReorderRequest';
 export type { ServiceCategoryReorderResponse } from './models/ServiceCategoryReorderResponse';
 export type { ServiceCategorySchema } from './models/ServiceCategorySchema';
@@ -321,7 +315,6 @@ export type { ServiceDeleteRequest } from './models/ServiceDeleteRequest';
 export type { ServiceDeleteResponse } from './models/ServiceDeleteResponse';
 export type { ServiceGetAllCategoriesResponse } from './models/ServiceGetAllCategoriesResponse';
 export type { ServiceGetAllResponse } from './models/ServiceGetAllResponse';
-export type { ServicePriceCategorySchema } from './models/ServicePriceCategorySchema';
 export type { ServicePriceRangeSchema } from './models/ServicePriceRangeSchema';
 export type { ServiceReorderRequest } from './models/ServiceReorderRequest';
 export type { ServiceReorderResponse } from './models/ServiceReorderResponse';
@@ -359,8 +352,6 @@ export type { UpdatePayRateRequest } from './models/UpdatePayRateRequest';
 export type { UpdatePayRateResponse } from './models/UpdatePayRateResponse';
 export type { UpdatePlanningWorkShiftRequest } from './models/UpdatePlanningWorkShiftRequest';
 export type { UpdatePlanningWorkShiftResponse } from './models/UpdatePlanningWorkShiftResponse';
-export type { UpdatePriceCategoryRequest } from './models/UpdatePriceCategoryRequest';
-export type { UpdatePriceCategoryResponse } from './models/UpdatePriceCategoryResponse';
 export type { UpdateProjectRequest } from './models/UpdateProjectRequest';
 export type { UpdateProjectResponse } from './models/UpdateProjectResponse';
 export type { UpdateResidualProductRequest } from './models/UpdateResidualProductRequest';

src/client/models/CreatePriceCategoryRequest.ts

@@ -1,8 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type CreatePriceCategoryRequest = {
-    name: string;
-};
-

src/client/models/CreatePriceCategoryResponse.ts

@@ -1,9 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type CreatePriceCategoryResponse = {
-    ok: boolean;
-    message: string;
-};
-

src/client/models/DealQuickCreateRequest.ts

@@ -3,7 +3,6 @@
 /* tslint:disable */
 /* eslint-disable */
 import type { BaseMarketplaceSchema } from './BaseMarketplaceSchema';
-import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema';
 export type DealQuickCreateRequest = {
     name: string;
     clientName: string;
@@ -11,7 +10,6 @@ export type DealQuickCreateRequest = {
     acceptanceDate: string;
     shippingWarehouse: string;
     baseMarketplace: BaseMarketplaceSchema;
-    category?: (ServicePriceCategorySchema | null);
     statusId: number;
 };
 

src/client/models/DealSchema.ts

@@ -12,7 +12,6 @@ import type { DealProductSchema } from './DealProductSchema';
 import type { DealServiceSchema } from './DealServiceSchema';
 import type { DealStatusHistorySchema } from './DealStatusHistorySchema';
 import type { PalletSchema } from './PalletSchema';
-import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema';
 import type { ShippingWarehouseSchema } from './ShippingWarehouseSchema';
 import type { StatusSchema } from './StatusSchema';
 import type { UserSchema } from './UserSchema';
@@ -34,7 +33,6 @@ export type DealSchema = {
     comment: string;
     shippingWarehouse?: (ShippingWarehouseSchema | string | null);
     billRequest?: (DealBillRequestSchema | null);
-    category?: (ServicePriceCategorySchema | null);
     group?: (DealGroupSchema | null);
     manager?: (UserSchema | null);
     pallets?: Array<PalletSchema>;

src/client/models/DeletePriceCategoryRequest.ts

@@ -1,8 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type DeletePriceCategoryRequest = {
-    id: number;
-};
-

src/client/models/DeletePriceCategoryResponse.ts

@@ -1,9 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type DeletePriceCategoryResponse = {
-    ok: boolean;
-    message: string;
-};
-

src/client/models/GetAllPriceCategoriesResponse.ts

@@ -1,9 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema';
-export type GetAllPriceCategoriesResponse = {
-    priceCategories: Array<ServicePriceCategorySchema>;
-};
-

src/client/models/ProjectSchemaWithCount.ts

@@ -2,8 +2,9 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-export type ServicePriceCategorySchema = {
+export type ProjectSchemaWithCount = {
-    id: number;
     name: string;
+    id: number;
+    boardsCount: number;
 };
 

src/client/models/ServiceCategoryPriceSchema.ts

@@ -1,10 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema';
-export type ServiceCategoryPriceSchema = {
-    category: ServicePriceCategorySchema;
-    price: number;
-};
-

src/client/models/ServiceSchema.ts

@@ -2,7 +2,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { ServiceCategoryPriceSchema } from './ServiceCategoryPriceSchema';
 import type { ServiceCategorySchema } from './ServiceCategorySchema';
 import type { ServicePriceRangeSchema } from './ServicePriceRangeSchema';
 export type ServiceSchema = {
@@ -12,7 +11,6 @@ export type ServiceSchema = {
     price: number;
     serviceType: number;
     priceRanges: Array<ServicePriceRangeSchema>;
-    categoryPrices: Array<ServiceCategoryPriceSchema>;
     cost: (number | null);
     rank: string;
     isPlaceholder?: (boolean | null);

src/client/models/UpdatePriceCategoryRequest.ts

@@ -1,9 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type UpdatePriceCategoryRequest = {
-    id: number;
-    name: string;
-};
-

src/client/models/UpdatePriceCategoryResponse.ts

@@ -1,9 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type UpdatePriceCategoryResponse = {
-    ok: boolean;
-    message: string;
-};
-

src/client/services/ServiceService.ts

@@ -3,13 +3,8 @@
 /* tslint:disable */
 /* eslint-disable */
 import type { BaseEnumListSchema } from '../models/BaseEnumListSchema';
-import type { CreatePriceCategoryRequest } from '../models/CreatePriceCategoryRequest';
-import type { CreatePriceCategoryResponse } from '../models/CreatePriceCategoryResponse';
 import type { CreateServicesKitRequest } from '../models/CreateServicesKitRequest';
 import type { CreateServicesKitResponse } from '../models/CreateServicesKitResponse';
-import type { DeletePriceCategoryRequest } from '../models/DeletePriceCategoryRequest';
-import type { DeletePriceCategoryResponse } from '../models/DeletePriceCategoryResponse';
-import type { GetAllPriceCategoriesResponse } from '../models/GetAllPriceCategoriesResponse';
 import type { GetAllServicesKitsResponse } from '../models/GetAllServicesKitsResponse';
 import type { ServiceCategoryReorderRequest } from '../models/ServiceCategoryReorderRequest';
 import type { ServiceCategoryReorderResponse } from '../models/ServiceCategoryReorderResponse';
@@ -29,8 +24,6 @@ import type { ServiceUpdateCategoryRequest } from '../models/ServiceUpdateCatego
 import type { ServiceUpdateCategoryResponse } from '../models/ServiceUpdateCategoryResponse';
 import type { ServiceUpdateRequest } from '../models/ServiceUpdateRequest';
 import type { ServiceUpdateResponse } from '../models/ServiceUpdateResponse';
-import type { UpdatePriceCategoryRequest } from '../models/UpdatePriceCategoryRequest';
-import type { UpdatePriceCategoryResponse } from '../models/UpdatePriceCategoryResponse';
 import type { UpdateServicesKitRequest } from '../models/UpdateServicesKitRequest';
 import type { UpdateServicesKitResponse } from '../models/UpdateServicesKitResponse';
 import type { CancelablePromise } from '../core/CancelablePromise';
@@ -302,77 +295,6 @@ export class ServiceService {
             },
         });
     }
-    /**
-     * Get All Price Categories
-     * @returns GetAllPriceCategoriesResponse Successful Response
-     * @throws ApiError
-     */
-    public static getAllPriceCategories(): CancelablePromise<GetAllPriceCategoriesResponse> {
-        return __request(OpenAPI, {
-            method: 'GET',
-            url: '/service/price-categories/get-all',
-        });
-    }
-    /**
-     * Create Price Category
-     * @returns CreatePriceCategoryResponse Successful Response
-     * @throws ApiError
-     */
-    public static createPriceCategory({
-        requestBody,
-    }: {
-        requestBody: CreatePriceCategoryRequest,
-    }): CancelablePromise<CreatePriceCategoryResponse> {
-        return __request(OpenAPI, {
-            method: 'POST',
-            url: '/service/price-categories/create',
-            body: requestBody,
-            mediaType: 'application/json',
-            errors: {
-                422: `Validation Error`,
-            },
-        });
-    }
-    /**
-     * Update Price Category
-     * @returns UpdatePriceCategoryResponse Successful Response
-     * @throws ApiError
-     */
-    public static updatePriceCategory({
-        requestBody,
-    }: {
-        requestBody: UpdatePriceCategoryRequest,
-    }): CancelablePromise<UpdatePriceCategoryResponse> {
-        return __request(OpenAPI, {
-            method: 'POST',
-            url: '/service/price-categories/update',
-            body: requestBody,
-            mediaType: 'application/json',
-            errors: {
-                422: `Validation Error`,
-            },
-        });
-    }
-    /**
-     * Delete Price Category
-     * @returns DeletePriceCategoryResponse Successful Response
-     * @throws ApiError
-     */
-    public static deletePriceCategory({
-        requestBody,
-    }: {
-        requestBody: DeletePriceCategoryRequest,
-    }): CancelablePromise<DeletePriceCategoryResponse> {
-        return __request(OpenAPI, {
-            method: 'POST',
-            url: '/service/price-categories/delete',
-            body: requestBody,
-            mediaType: 'application/json',
-            errors: {
-                422: `Validation Error`,
-            },
-        });
-    }
     /**
      * Export List Pdf
      * @returns any Successful Response

src/components/Dnd/Deals/CreateDealForm/CreateDealFrom.tsx

@@ -8,7 +8,6 @@ import { DateTimePicker } from "@mantine/dates";
 import ShippingWarehouseAutocomplete
     from "../../../Selects/ShippingWarehouseAutocomplete/ShippingWarehouseAutocomplete.tsx";
 import BaseMarketplaceSelect from "../../../Selects/BaseMarketplaceSelect/BaseMarketplaceSelect.tsx";
-import ServicePriceCategorySelect from "../../../Selects/ServicePriceCategorySelect/ServicePriceCategorySelect.tsx";
 import { usePrefillDealContext } from "../../../../pages/DealsPage/contexts/PrefillDealContext.tsx";
 
 type Props = {
@@ -69,14 +68,6 @@ const CreateDealFrom: FC<Props> = ({ onSubmit, onCancel }) => {
                         placeholder={"Склад отгрузки"}
                     />
                 </div>
-                <div className={styles["inputs"]}>
-                    <ServicePriceCategorySelect
-                        rightSection={<></>}
-                        placeholder={"Выберите категорию"}
-                        {...form.getInputProps("category")}
-                    />
-                </div>
-
                 <div className={styles["inputs"]}>
                     <Textarea
                         autosize

src/components/Selects/ServicePriceCategorySelect/ServicePriceCategorySelect.tsx

@@ -1,19 +0,0 @@
-import ObjectSelect, {
-    ObjectSelectProps,
-} from "../../ObjectSelect/ObjectSelect.tsx";
-import { ServicePriceCategorySchema } from "../../../client";
-import useServicePriceCategoriesList from "../../../pages/ServicesPage/hooks/useServicePriceCategoriesList.tsx";
-
-type Props = Omit<ObjectSelectProps<ServicePriceCategorySchema>, "data">;
-
-const ServicePriceCategorySelect = (props: Props) => {
-    const { objects } = useServicePriceCategoriesList();
-    return (
-        <ObjectSelect
-            {...props}
-            data={objects}
-        />
-    );
-};
-
-export default ServicePriceCategorySelect;

src/components/ServiceWithPriceInput/ServiceWithPriceInput.tsx

@@ -1,5 +1,5 @@
 import { ObjectSelectProps } from "../ObjectSelect/ObjectSelect.tsx";
-import { ServicePriceCategorySchema, ServiceSchema } from "../../client";
+import { ServiceSchema } from "../../client";
 import {
     Flex,
     FlexProps,
@@ -21,7 +21,6 @@ type Props = {
     containerProps: FlexProps;
     filterType?: ServiceType;
     lockOnEdit?: boolean;
-    category?: ServicePriceCategorySchema;
 };
 const ServiceWithPriceInput: FC<Props> = ({
     serviceProps,
@@ -30,7 +29,6 @@ const ServiceWithPriceInput: FC<Props> = ({
     containerProps,
     filterType = ServiceType.PRODUCT_SERVICE,
     lockOnEdit = true,
-    category,
 }) => {
     const [price, setPrice] = useState<number | undefined>(
         typeof priceProps.value === "number" ? priceProps.value : undefined
@@ -51,19 +49,8 @@ const ServiceWithPriceInput: FC<Props> = ({
         setPrice(range.price);
         return true;
     };
-    const setPriceBasedOnCategory = () => {
-        if (!category || !service) return false;
-        const categoryPrice = service.categoryPrices.find(
-            categoryPrice => categoryPrice.category.id === category.id
-        );
-        if (!categoryPrice) return false;
-        setPrice(categoryPrice.price);
-        return true;
-    };
     const setPriceBasedOnService = () => {
         if (!service) return;
-        // if category is set, we should not set price based on service
-        if (setPriceBasedOnCategory()) return;
         if (setPriceBasedOnQuantity()) return;
         setPrice(service.price);
     };
@@ -76,9 +63,6 @@ const ServiceWithPriceInput: FC<Props> = ({
     };
     useEffect(() => {
         if (isFirstRender.current && lockOnEdit) return;
-
-        // we need to set price based on quantity only if category is not set, because category has higher priority
-        if (category) return;
         setPriceBasedOnQuantity();
     }, [quantity]);
 

src/modals/modals.ts

@@ -21,7 +21,6 @@ import ServicesKitSelectModal from "./ServicesKitSelectModal/ServicesKitSelectMo
 import SelectDealProductsModal from "../pages/DealsPage/modals/SelectDealProductsModal.tsx";
 import ShippingWarehouseForm from "../pages/ShippingWarehousesPage/modals/ShippingWarehouseForm.tsx";
 import MarketplaceFormModal from "../pages/MarketplacesPage/modals/MarketplaceFormModal/MarketplaceFormModal.tsx";
-import ServicePriceCategoryForm from "../pages/ServicesPage/modals/ServicePriceCategoryForm.tsx";
 import ScanningModal from "./ScanningModal/ScanningModal.tsx";
 import TransactionFormModal from "../pages/AdminPage/tabs/Transactions/modals/TransactionFormModal.tsx";
 import TransactionTagsModal from "../pages/AdminPage/tabs/Transactions/modals/TransactionTagsModal.tsx";
@@ -61,7 +60,6 @@ export const modals = {
     selectDealProductsModal: SelectDealProductsModal,
     shippingWarehouseForm: ShippingWarehouseForm,
     marketplaceFormModal: MarketplaceFormModal,
-    servicePriceCategoryForm: ServicePriceCategoryForm,
     scanningModal: ScanningModal,
     transactionFormModal: TransactionFormModal,
     transactionTagsModal: TransactionTagsModal,

src/pages/DealsPage/drawers/DealEditDrawer/tabs/DealEditDrawerGeneralTab.tsx

@@ -174,14 +174,6 @@ const Content: FC<Props> = ({ deal }) => {
                             {...form.getInputProps("status")}
                             label={"Статус"}
                         />
-                        {deal.category && (
-                            <TextInput
-                                disabled
-                                placeholder={"Категория"}
-                                label={"Категория"}
-                                value={deal.category.name}
-                            />
-                        )}
                         <Textarea
                             h={rem(150)}
                             styles={{

src/pages/DealsPage/modals/AddDealServiceModal.tsx

@@ -1,15 +1,8 @@
 import { ContextModalProps } from "@mantine/modals";
-import BaseFormModal, {
+import BaseFormModal, { CreateEditFormProps } from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
-    CreateEditFormProps,
+import { DealServiceSchema } from "../../../client";
-} from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
-import { DealServiceSchema, ServicePriceCategorySchema } from "../../../client";
 import { useForm } from "@mantine/form";
-import {
+import { ComboboxItem, ComboboxItemGroup, NumberInput, OptionsFilter } from "@mantine/core";
-    ComboboxItem,
-    ComboboxItemGroup,
-    NumberInput,
-    OptionsFilter,
-} from "@mantine/core";
 import ServiceWithPriceInput from "../../../components/ServiceWithPriceInput/ServiceWithPriceInput.tsx";
 import { ServiceType } from "../../../shared/enums/ServiceType.ts";
 import { useSelector } from "react-redux";
@@ -17,7 +10,6 @@ import { RootState } from "../../../redux/store.ts";
 
 type RestProps = {
     serviceIds?: number[];
-    category?: ServicePriceCategorySchema;
 };
 type Props = CreateEditFormProps<Partial<DealServiceSchema>> & RestProps;
 const AddDealServiceModal = ({
@@ -26,7 +18,6 @@ const AddDealServiceModal = ({
     innerProps,
 }: ContextModalProps<Props>) => {
     const authState = useSelector((state: RootState) => state.auth);
-    console.log(innerProps.category);
     const isEditing = "element" in innerProps;
     const form = useForm<Partial<DealServiceSchema>>({
         initialValues: isEditing
@@ -77,7 +68,6 @@ const AddDealServiceModal = ({
             <BaseFormModal.Body>
                 <>
                     <ServiceWithPriceInput
-                        category={innerProps.category}
                         serviceProps={{
                             ...form.getInputProps("service"),
                             label: "Услуга",

src/pages/DealsPage/modals/ProductServiceFormModal.tsx

@@ -3,7 +3,6 @@ import BaseFormModal, {
 } from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
 import {
     DealProductServiceSchema,
-    ServicePriceCategorySchema,
     ServiceSchema,
 } from "../../../client";
 import { ContextModalProps } from "@mantine/modals";
@@ -18,7 +17,6 @@ import { RootState } from "../../../redux/store.ts";
 type RestProps = {
     quantity: number;
     serviceIds: number[];
-    category?: ServicePriceCategorySchema;
 };
 type Props = CreateEditFormProps<DealProductServiceSchema> & RestProps;
 
@@ -60,7 +58,6 @@ const ProductServiceFormModal = ({
                 <>
                     <Flex w={"100%"} direction={"column"} gap={rem(10)}>
                         <ServiceWithPriceInput
-                            category={innerProps.category}
                             serviceProps={{
                                 ...form.getInputProps("service"),
                                 label: "Услуга",

src/pages/DealsPage/tabs/ProductAndServiceTab/components/DealServicesTable/DealServicesTable.tsx

@@ -50,7 +50,6 @@ const DealServicesTable: FC<Props> = ({
             innerProps: {
                 onCreate: onCreate,
                 serviceIds,
-                category: dealState.deal?.category || undefined,
             },
             withCloseButton: false,
         });

src/pages/DealsPage/tabs/ProductAndServiceTab/components/ProductServicesTable/ProductServicesTable.tsx

@@ -48,7 +48,6 @@ const ProductServicesTable: FC<Props> = ({
                 onCreate: onCreate,
                 serviceIds,
                 quantity,
-                category: dealState.deal?.category || undefined,
             },
             withCloseButton: false,
         });
@@ -63,7 +62,6 @@ const ProductServicesTable: FC<Props> = ({
                 onChange,
                 serviceIds,
                 quantity,
-                category: dealState.deal?.category || undefined,
             },
             withCloseButton: false,
         });

src/pages/ServicesPage/components/ServicePriceCategoryTable/ServicePriceCategoryTable.tsx

@@ -1,53 +0,0 @@
-import { CRUDTableProps } from "../../../../types/CRUDTable.tsx";
-import { ServicePriceCategorySchema } from "../../../../client";
-import { FC } from "react";
-import { BaseTable } from "../../../../components/BaseTable/BaseTable.tsx";
-import useServicePriceCategoryTableColumns from "./columns.tsx";
-import { MRT_TableOptions } from "mantine-react-table";
-import { ActionIcon, Flex, Tooltip } from "@mantine/core";
-import { IconEdit, IconTrash } from "@tabler/icons-react";
-
-type Props = CRUDTableProps<ServicePriceCategorySchema>;
-
-const ServicePriceCategoryTable: FC<Props> = ({
-    items,
-    onChange,
-    onDelete,
-}) => {
-    const columns = useServicePriceCategoryTableColumns();
-    return (
-        <BaseTable
-            data={items}
-            columns={columns}
-            restProps={
-                {
-                    enableRowActions: true,
-                    renderRowActions: ({ row }) => (
-                        <Flex gap="md">
-                            <Tooltip label="Редактировать">
-                                <ActionIcon
-                                    onClick={() =>
-                                        onChange && onChange(row.original)
-                                    }
-                                    variant={"default"}>
-                                    <IconEdit />
-                                </ActionIcon>
-                            </Tooltip>
-                            <Tooltip label="Удалить">
-                                <ActionIcon
-                                    onClick={() =>
-                                        onDelete && onDelete(row.original)
-                                    }
-                                    variant={"default"}>
-                                    <IconTrash />
-                                </ActionIcon>
-                            </Tooltip>
-                        </Flex>
-                    ),
-                } as MRT_TableOptions<ServicePriceCategorySchema>
-            }
-        />
-    );
-};
-
-export default ServicePriceCategoryTable;

src/pages/ServicesPage/components/ServicePriceCategoryTable/columns.tsx

@@ -1,19 +0,0 @@
-import { useMemo } from "react";
-import { MRT_ColumnDef } from "mantine-react-table";
-import { ServicePriceCategorySchema } from "../../../../client";
-
-const useServicePriceCategoryTableColumns = () => {
-    return useMemo<MRT_ColumnDef<ServicePriceCategorySchema>[]>(
-        () => [
-            {
-                accessorKey: "name",
-                header: "Название",
-                enableColumnActions: false,
-                enableSorting: false,
-            },
-        ],
-        []
-    );
-};
-
-export default useServicePriceCategoryTableColumns;

src/pages/ServicesPage/components/ServicePriceInput/PriceCategoryInput.tsx

@@ -1,70 +0,0 @@
-import { BaseFormInputProps } from "../../../../types/utils.ts";
-import type {
-    ServiceCategoryPriceSchema,
-    ServicePriceCategorySchema,
-} from "../../../../client";
-import { FC, useEffect, useState } from "react";
-import { Flex, NumberInput, rem } from "@mantine/core";
-import ServicePriceCategorySelect from "../../../../components/Selects/ServicePriceCategorySelect/ServicePriceCategorySelect.tsx";
-
-export type PriceCategoryInputProps = BaseFormInputProps<
-    ServiceCategoryPriceSchema[]
->;
-
-const PriceCategoryInput: FC<PriceCategoryInputProps> = (
-    props: PriceCategoryInputProps
-) => {
-    const [innerState, setInnerState] = useState<ServiceCategoryPriceSchema[]>(
-        props.value || []
-    );
-    const [category, setCategory] = useState<
-        ServicePriceCategorySchema | undefined
-    >(undefined);
-
-    const getValue = (): number | undefined | string => {
-        if (category === undefined) return undefined;
-        const value = innerState.find(item => item.category.id === category.id);
-
-        return value?.price || "";
-    };
-    const handleChange = (value: number | string) => {
-        // remove value if is string
-        if (typeof value === "string") {
-            setInnerState(
-                innerState.filter(item => item.category.id !== category?.id)
-            );
-            return;
-        }
-        const newValue = {
-            category: category as ServicePriceCategorySchema,
-            price: value,
-        };
-        const newInnerState = innerState.filter(
-            item => item.category.id !== category?.id
-        );
-        setInnerState([...newInnerState, newValue]);
-    };
-    useEffect(() => {
-        if (props.value === innerState) return;
-        props.onChange(innerState);
-    }, [innerState]);
-    return (
-        <Flex
-            direction={"column"}
-            gap={rem(10)}>
-            <ServicePriceCategorySelect
-                label={"Категория цены"}
-                placeholder={"Выберите категорию цены"}
-                onChange={setCategory}
-            />
-            <NumberInput
-                label={"Цена"}
-                placeholder={"Введите цену"}
-                value={getValue()}
-                onChange={handleChange}
-            />
-        </Flex>
-    );
-};
-
-export default PriceCategoryInput;

src/pages/ServicesPage/components/ServicePriceTypeSegmentedControl/ServicePriceTypeSegmentedControl.tsx

@@ -5,7 +5,6 @@ import { omit } from "lodash";
 export enum ServicePriceType {
     DEFAULT,
     BY_RANGE,
-    BY_CATEGORY,
 }
 
 type RestProps = {
@@ -26,10 +25,6 @@ const ServicePriceTypeSegmentedControl: FC<Props> = props => {
             label: "По диапазону",
             value: ServicePriceType.BY_RANGE.toString(),
         },
-        {
-            label: "По категории",
-            value: ServicePriceType.BY_CATEGORY.toString(),
-        },
     ];
     const handleChange = (value: string) => {
         onChange(Number(value));

src/pages/ServicesPage/components/ServiceTypeSegmentedControl/ServiceTypeSegmentedControl.tsx

@@ -5,7 +5,6 @@ export enum ServicesTab {
     DEAL_SERVICE,
     PRODUCT_SERVICE,
     SERVICES_KITS,
-    SERVICES_PRICE_CATEGORIES,
 }
 
 type Props = Omit<SegmentedControlProps, "data">;
@@ -22,10 +21,6 @@ const data = [
         label: "Наборы услуг",
         value: ServicesTab.SERVICES_KITS.toString(),
     },
-    {
-        label: "Категории цен",
-        value: ServicesTab.SERVICES_PRICE_CATEGORIES.toString(),
-    },
 ];
 const ServiceTypeSegmentedControl: FC<Props> = props => {
     return (

src/pages/ServicesPage/hooks/useServicePriceCategoriesList.tsx

@@ -1,11 +0,0 @@
-import ObjectList from "../../../hooks/objectList.tsx";
-import { ServiceService } from "../../../client";
-
-const useServicePriceCategoriesList = () =>
-    ObjectList({
-        queryFn: ServiceService.getAllPriceCategories,
-        getObjectsFn: response => response.priceCategories,
-        queryKey: "getAllPriceCategories",
-    });
-
-export default useServicePriceCategoriesList;

src/pages/ServicesPage/hooks/useServicePriceCategoryState.tsx

@@ -1,83 +0,0 @@
-import UseObjectState from "../../../types/UseObjectState.ts";
-import {
-    type ServicePriceCategorySchema,
-    ServiceService,
-} from "../../../client";
-import useServicePriceCategoriesList from "./useServicePriceCategoriesList.tsx";
-import { modals } from "@mantine/modals";
-import { notifications } from "../../../shared/lib/notifications.ts";
-
-const useServicePriceCategoryState =
-    (): UseObjectState<ServicePriceCategorySchema> => {
-        const { objects, refetch } = useServicePriceCategoriesList();
-        const onCreateClick = () => {
-            modals.openContextModal({
-                modal: "servicePriceCategoryForm",
-                title: "Создание категории цен",
-                withCloseButton: false,
-                innerProps: {
-                    onCreate,
-                },
-            });
-        };
-        const onCreate = (values: ServicePriceCategorySchema) => {
-            console.log(ServiceService);
-            ServiceService.createPriceCategory({
-                requestBody: {
-                    name: values.name,
-                },
-            }).then(async ({ ok, message }) => {
-                notifications.guess(ok, { message: message });
-                if (!ok) return;
-                await refetch();
-            });
-        };
-        const onDelete = (item: ServicePriceCategorySchema) => {
-            modals.openConfirmModal({
-                title: "Удаление категории",
-                children: "Вы уверены, что хотите удалить категорию?",
-                onConfirm: () => {
-                    ServiceService.deletePriceCategory({
-                        requestBody: {
-                            id: item.id,
-                        },
-                    }).then(async ({ ok, message }) => {
-                        notifications.guess(ok, { message: message });
-                        if (!ok) return;
-                        await refetch();
-                    });
-                },
-            });
-        };
-        const onChange = (item: ServicePriceCategorySchema) => {
-            modals.openContextModal({
-                modal: "servicePriceCategoryForm",
-                title: "Изменение категории цен",
-                withCloseButton: false,
-                innerProps: {
-                    onChange: (values: ServicePriceCategorySchema) => {
-                        ServiceService.updatePriceCategory({
-                            requestBody: {
-                                id: item.id,
-                                name: values.name,
-                            },
-                        }).then(async ({ ok, message }) => {
-                            notifications.guess(ok, { message: message });
-                            if (!ok) return;
-                            await refetch();
-                        });
-                    },
-                    element: item,
-                },
-            });
-        };
-
-        return {
-            onCreateClick,
-            onCreate,
-            onDelete,
-            onChange,
-            objects,
-        };
-    };
-export default useServicePriceCategoryState;

src/pages/ServicesPage/modals/CreateServiceModal.tsx

@@ -1,9 +1,7 @@
 import { ServicePriceRangeSchema, ServiceSchema } from "../../../client";
 import { useForm } from "@mantine/form";
 import { ContextModalProps } from "@mantine/modals";
-import BaseFormModal, {
+import BaseFormModal, { CreateEditFormProps } from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
-    CreateEditFormProps,
-} from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
 import { Fieldset, Flex, rem, TextInput } from "@mantine/core";
 import ServiceCategorySelect from "../components/ServiceCategorySelect/ServiceCategorySelect.tsx";
 import ServiceTypeSelect from "../components/ServiceTypeSelect/ServiceTypeSelect.tsx";
@@ -11,13 +9,8 @@ import ServicePriceTypeSegmentedControl, {
     ServicePriceType,
 } from "../components/ServicePriceTypeSegmentedControl/ServicePriceTypeSegmentedControl.tsx";
 import { useEffect, useState } from "react";
-import RangePriceInput, {
+import RangePriceInput, { PriceRangeInputType } from "../components/ServicePriceInput/RangePriceInput.tsx";
-    PriceRangeInputType,
-} from "../components/ServicePriceInput/RangePriceInput.tsx";
 import SinglePriceInput from "../components/ServicePriceInput/SinglePriceInput.tsx";
-import PriceCategoryInput, {
-    PriceCategoryInputProps,
-} from "../components/ServicePriceInput/PriceCategoryInput.tsx";
 
 type Props = CreateEditFormProps<ServiceSchema>;
 const CreateServiceModal = ({
@@ -44,7 +37,6 @@ const CreateServiceModal = ({
             serviceType: -1,
             priceRanges: [] as ServicePriceRangeSchema[],
             cost: null,
-            categoryPrices: [],
             rank: "",
         };
 
@@ -89,14 +81,6 @@ const CreateServiceModal = ({
                         ) as PriceRangeInputType)}
                     />
                 );
-            case ServicePriceType.BY_CATEGORY:
-                return (
-                    <PriceCategoryInput
-                        {...(form.getInputProps(
-                            "categoryPrices",
-                        ) as PriceCategoryInputProps)}
-                    />
-                );
         }
     };
     const onCancelClick = () => {

src/pages/ServicesPage/modals/ServicePriceCategoryForm.tsx

@@ -1,44 +0,0 @@
-import { ServicePriceCategorySchema } from "../../../client";
-import BaseFormModal, {
-    CreateEditFormProps,
-} from "../../ClientsPage/modals/BaseFormModal/BaseFormModal.tsx";
-import { ContextModalProps } from "@mantine/modals";
-import { TextInput } from "@mantine/core";
-import { useForm } from "@mantine/form";
-
-type Props = CreateEditFormProps<ServicePriceCategorySchema>;
-
-const ServicePriceCategoryForm = ({
-    context,
-    id,
-    innerProps,
-}: ContextModalProps<Props>) => {
-    const isEditing = "element" in innerProps;
-    const initialValues: Partial<ServicePriceCategorySchema> = isEditing
-        ? innerProps.element
-        : {
-              name: "",
-          };
-    const form = useForm<Partial<ServicePriceCategorySchema>>({
-        initialValues,
-    });
-    return (
-        <BaseFormModal
-            {...innerProps}
-            form={form}
-            closeOnSubmit
-            onClose={() => context.closeContextModal(id)}>
-            <BaseFormModal.Body>
-                <>
-                    <TextInput
-                        label={"Название"}
-                        placeholder={"Введите название категории"}
-                        {...form.getInputProps("name")}
-                    />
-                </>
-            </BaseFormModal.Body>
-        </BaseFormModal>
-    );
-};
-
-export default ServicePriceCategoryForm;

src/pages/ServicesPage/ui/ServicesPage.tsx

@@ -7,11 +7,8 @@ import ServiceTypeSegmentedControl, {
     ServicesTab,
 } from "../components/ServiceTypeSegmentedControl/ServiceTypeSegmentedControl.tsx";
 import ServicesKitsTable from "../components/ServicesKitsTable/ServicesKitsTable.tsx";
-import ServicePriceCategoryTable from "../components/ServicePriceCategoryTable/ServicePriceCategoryTable.tsx";
 import useServicesState from "../hooks/useServicesState.tsx";
 import useServicesKitsState from "../hooks/useServicesKitsState.tsx";
-import useServicePriceCategoryState from "../hooks/useServicePriceCategoryState.tsx";
-import { ObjectStateToTableProps } from "../../../types/utils.ts";
 import { IconDownload, IconFileExcel, IconFileTypePdf } from "@tabler/icons-react";
 import FileSaver from "file-saver";
 import { getCurrentDateTimeForFilename } from "../../../shared/lib/date.ts";
@@ -28,10 +25,6 @@ export const ServicesPage: FC = () => {
     } = useServicesState();
     const { servicesKits, onKitUpdate, onKitCreateClick } =
         useServicesKitsState();
-    const {
-        onCreateClick: onCreatePriceCategoryClick,
-        ...priceCategoryRestProps
-    } = useServicePriceCategoryState();
     const getBody = () => {
         switch (serviceType) {
             case ServicesTab.SERVICES_KITS:
@@ -60,12 +53,6 @@ export const ServicesPage: FC = () => {
                     />
                 );
             }
-            case ServicesTab.SERVICES_PRICE_CATEGORIES:
-                return (
-                    <ServicePriceCategoryTable
-                        {...ObjectStateToTableProps(priceCategoryRestProps)}
-                    />
-                );
         }
     };
     const getControls = () => {
@@ -141,18 +128,6 @@ export const ServicesPage: FC = () => {
                         />
                     </Flex>
                 );
-            case ServicesTab.SERVICES_PRICE_CATEGORIES:
-                return (
-                    <Button
-                        variant={"default"}
-                        onClick={() => {
-                            if (onCreatePriceCategoryClick) {
-                                onCreatePriceCategoryClick();
-                            }
-                        }}>
-                        Создать категорию
-                    </Button>
-                );
         }
     };
 

src/types/QuickDeal.ts

@@ -1,4 +1,4 @@
-import { BaseMarketplaceSchema, ServicePriceCategorySchema } from "../client";
+import { BaseMarketplaceSchema } from "../client";
 
 export type QuickDeal = {
     name: string;
@@ -8,5 +8,4 @@ export type QuickDeal = {
     acceptanceDate: Date;
     shippingWarehouse: string;
     baseMarketplace: BaseMarketplaceSchema;
-    category?: ServicePriceCategorySchema;
 };