From 4c5b9c7734f56a03b5d667e19fc389ec92360c3f Mon Sep 17 00:00:00 2001
From: AlexSserb <aserbin190@gmail.com>
Date: Tue, 16 Sep 2025 19:51:37 +0400
Subject: [PATCH] fix: fixed deal service editor modal

---
 .../ServiceSelect/ServiceSelect.tsx           |  9 ++++--
 .../DealServiceEditorModal.tsx                | 31 +++----------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ServiceSelect/ServiceSelect.tsx b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ServiceSelect/ServiceSelect.tsx
index 32bab7e..3a0851c 100644
--- a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ServiceSelect/ServiceSelect.tsx
+++ b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/components/ServiceSelect/ServiceSelect.tsx
@@ -20,9 +20,12 @@ type Props = Omit<ObjectSelectProps<ServiceSchema>, "data"> & RestProps;
 
 const ServiceSelect: FC<Props> = props => {
     const { services } = useServicesList();
-    const data = props.filterType
-        ? services.filter(service => service.serviceType === props.filterType)
-        : services;
+    const data =
+        props.filterType !== undefined
+            ? services.filter(
+                  service => service.serviceType === props.filterType
+              )
+            : services;
 
     const restProps = omit(props, ["filterType"]);
 
diff --git a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/DealServiceEditorModal.tsx b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/DealServiceEditorModal.tsx
index 85a9980..ee57802 100644
--- a/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/DealServiceEditorModal.tsx
+++ b/src/modules/dealModules/dealEditorTabs/FulfillmentBaseTab/modals/DealServiceEditorModal/DealServiceEditorModal.tsx
@@ -1,11 +1,6 @@
 "use client";
 
-import {
-    ComboboxItem,
-    ComboboxItemGroup,
-    NumberInput,
-    OptionsFilter,
-} from "@mantine/core";
+import { NumberInput } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { ContextModalProps } from "@mantine/modals";
 import {
@@ -54,26 +49,6 @@ const DealServiceEditorModal = ({
 
     const onClose = () => context.closeContextModal(id);
 
-    const serviceOptionsFilter = ({
-        options,
-    }: {
-        options: ComboboxItemGroup[];
-    }) => {
-        if (!innerProps.serviceIdsToExclude) return options;
-        const productServiceIds = innerProps.serviceIdsToExclude;
-        return (options as ComboboxItemGroup[]).map(({ items, group }) => {
-            return {
-                group,
-                items: items.filter(
-                    item =>
-                        !productServiceIds.includes(
-                            Number((item as ComboboxItem).value)
-                        )
-                ),
-            };
-        });
-    };
-
     return (
         <BaseFormModal
             {...innerProps}
@@ -90,7 +65,9 @@ const DealServiceEditorModal = ({
                     label: "Услуга",
                     placeholder: "Выберите услугу",
                     disabled: innerProps.isEditing,
-                    filter: serviceOptionsFilter as OptionsFilter,
+                    filterBy: item =>
+                        !innerProps.serviceIdsToExclude?.includes(item.id) ||
+                        innerProps.isEditing,
                 }}
                 priceProps={{
                     ...form.getInputProps("price"),