From 01d342b557feeea50682b434fa7ecc3543cc72b8 Mon Sep 17 00:00:00 2001
From: Bivekich <biveki-dev@yandex.ru>
Date: Mon, 21 Jul 2025 23:03:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=20MessengerAttachments:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D0=BE=20aria-hidden=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BA=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9,=20=D1=83=D0=BB=D1=83=D1=87=D1=88?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C.=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=83=D1=81=D1=82=D0=B0=D1=80=D0=B5=D0=B2=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D1=8B=20WildberriesCard=20=D0=B8=20SelectedCard=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20create-supply-form=20=D0=B8=20wb-product-cards,?=
 =?UTF-8?q?=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B0=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D0=B0=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messenger/messenger-attachments.tsx       |  8 +--
 .../supplies/create-supply-form.tsx           | 27 +--------
 src/components/supplies/wb-product-cards.tsx  | 46 +++-------------
 src/types/supplies.ts                         | 55 +++++++++++++++++++
 4 files changed, 67 insertions(+), 69 deletions(-)
 create mode 100644 src/types/supplies.ts

diff --git a/src/components/messenger/messenger-attachments.tsx b/src/components/messenger/messenger-attachments.tsx
index b841ef9..967d84d 100644
--- a/src/components/messenger/messenger-attachments.tsx
+++ b/src/components/messenger/messenger-attachments.tsx
@@ -137,7 +137,7 @@ export function MessengerAttachments({ counterparty, onViewChange }: MessengerAt
   const renderFileIcon = (fileType?: string) => {
     if (!fileType) return <FileText className="h-4 w-4 text-gray-400" />
     
-    if (fileType.startsWith('image/')) return <Image className="h-4 w-4 text-blue-400" />
+    if (fileType.startsWith('image/')) return <Image className="h-4 w-4 text-blue-400" aria-hidden="true" />
     if (fileType.startsWith('audio/')) return <Music className="h-4 w-4 text-green-400" />
     if (fileType.startsWith('video/')) return <Video className="h-4 w-4 text-purple-400" />
     return <FileText className="h-4 w-4 text-gray-400" />
@@ -207,7 +207,7 @@ export function MessengerAttachments({ counterparty, onViewChange }: MessengerAt
                         className="w-full h-full object-cover"
                       />
                       <div className="absolute inset-0 bg-black/20 flex items-center justify-center opacity-0 hover:opacity-100 transition-opacity">
-                        <Image className="h-4 w-4 text-white" />
+                        <Image className="h-4 w-4 text-white" aria-hidden="true" />
                       </div>
                     </div>
                   ) : (
@@ -319,7 +319,7 @@ export function MessengerAttachments({ counterparty, onViewChange }: MessengerAt
             {imageMessages.length === 0 ? (
               <div className="flex items-center justify-center h-64">
                 <div className="text-center">
-                  <Image className="h-12 w-12 text-white/20 mx-auto mb-4" />
+                  <Image className="h-12 w-12 text-white/20 mx-auto mb-4" aria-hidden="true" />
                   <p className="text-white/60">Нет изображений</p>
                 </div>
               </div>
@@ -339,7 +339,7 @@ export function MessengerAttachments({ counterparty, onViewChange }: MessengerAt
                         className="w-full h-full object-cover"
                       />
                       <div className="absolute inset-0 bg-black/0 group-hover:bg-black/20 transition-colors flex items-center justify-center">
-                        <Image className="h-6 w-6 text-white opacity-0 group-hover:opacity-100 transition-opacity" />
+                        <Image className="h-6 w-6 text-white opacity-0 group-hover:opacity-100 transition-opacity" aria-hidden="true" />
                       </div>
                       <div className="absolute bottom-2 left-2 right-2">
                         <div className="text-white text-xs truncate bg-black/50 px-2 py-1 rounded">
diff --git a/src/components/supplies/create-supply-form.tsx b/src/components/supplies/create-supply-form.tsx
index 61a6a38..81dcf6b 100644
--- a/src/components/supplies/create-supply-form.tsx
+++ b/src/components/supplies/create-supply-form.tsx
@@ -16,6 +16,7 @@ import {
   Star
 } from 'lucide-react'
 import { WBProductCards } from './wb-product-cards'
+import { SelectedCard, WildberriesCard } from '@/types/supplies'
 // import { WholesalerSelection } from './wholesaler-selection'
 
 interface Wholesaler {
@@ -32,33 +33,7 @@ interface Wholesaler {
   specialization: string[]
 }
 
-interface WildberriesCard {
-  nmID: number
-  vendorCode: string
-  title: string
-  description: string
-  brand: string
-  mediaFiles: string[]
-  sizes: Array<{
-    chrtID: number
-    techSize: string
-    wbSize: string
-    price: number
-    discountedPrice: number
-    quantity: number
-  }>
-}
 
-interface SelectedCard {
-  card: WildberriesCard
-  selectedQuantity: number
-  selectedMarket: string
-  selectedPlace: string
-  sellerName: string
-  sellerPhone: string
-  deliveryDate: string
-  selectedServices: string[]
-}
 
 interface CreateSupplyFormProps {
   onClose: () => void
diff --git a/src/components/supplies/wb-product-cards.tsx b/src/components/supplies/wb-product-cards.tsx
index eba7330..1aa451d 100644
--- a/src/components/supplies/wb-product-cards.tsx
+++ b/src/components/supplies/wb-product-cards.tsx
@@ -34,46 +34,9 @@ import { apolloClient } from '@/lib/apollo-client'
 import { GET_MY_COUNTERPARTIES, GET_COUNTERPARTY_SERVICES, GET_COUNTERPARTY_SUPPLIES } from '@/graphql/queries'
 import { CREATE_WILDBERRIES_SUPPLY } from '@/graphql/mutations'
 import { toast } from 'sonner'
+import { SelectedCard, FulfillmentService, ConsumableService, WildberriesCard } from '@/types/supplies'
 
-interface WildberriesCard {
-  nmID: number
-  vendorCode: string
-  sizes: Array<{
-    chrtID: number
-    techSize: string
-    wbSize: string
-    price: number
-    discountedPrice: number
-    quantity: number
-  }>
-  mediaFiles: string[]
-  object: string
-  parent: string
-  countryProduction: string
-  supplierVendorCode: string
-  brand: string
-  title: string
-  description: string
-}
 
-interface SelectedCard {
-  card: WildberriesCard
-  selectedQuantity: number
-  customPrice: number // Пользовательская цена за все количество
-  selectedFulfillmentOrg: string // ID выбранной FF организации
-  selectedFulfillmentServices: string[] // ID выбранных услуг FF (множественный выбор)
-  selectedConsumableOrg: string // ID выбранной организации расходников
-  selectedConsumableServices: string[] // ID выбранных расходников (множественный выбор)
-  deliveryDate: string
-}
-
-interface FulfillmentService {
-  id: string
-  name: string
-  description?: string
-  price: number
-  organizationName: string
-}
 
 interface Organization {
   id: string
@@ -519,7 +482,12 @@ export function WBProductCards({ onBack, onComplete }: WBProductCardsProps) {
           selectedFulfillmentServices: [],
           selectedConsumableOrg: '',
           selectedConsumableServices: [],
-          deliveryDate: ''
+          deliveryDate: '',
+          selectedMarket: '',
+          selectedPlace: '',
+          sellerName: '',
+          sellerPhone: '',
+          selectedServices: []
         }
         return [...prev, newSelectedCard]
       }
diff --git a/src/types/supplies.ts b/src/types/supplies.ts
new file mode 100644
index 0000000..4da63a7
--- /dev/null
+++ b/src/types/supplies.ts
@@ -0,0 +1,55 @@
+export interface WildberriesCard {
+  nmID: number
+  vendorCode: string
+  sizes: Array<{
+    chrtID: number
+    techSize: string
+    wbSize: string
+    price: number
+    discountedPrice: number
+    quantity: number
+  }>
+  mediaFiles: string[]
+  object: string
+  parent: string
+  countryProduction: string
+  supplierVendorCode: string
+  brand: string
+  title: string
+  description: string
+}
+
+export interface SelectedCard {
+  card: WildberriesCard
+  selectedQuantity: number
+  customPrice: number // Пользовательская цена за все количество
+  selectedFulfillmentOrg: string // ID выбранной FF организации
+  selectedFulfillmentServices: string[] // ID выбранных услуг FF (множественный выбор)
+  selectedConsumableOrg: string // ID выбранной организации расходников
+  selectedConsumableServices: string[] // ID выбранных расходников (множественный выбор)
+  deliveryDate: string
+  selectedMarket: string
+  selectedPlace: string
+  sellerName: string
+  sellerPhone: string
+  selectedServices: string[]
+}
+
+export interface FulfillmentService {
+  id: string
+  name: string
+  description?: string
+  price: number
+  organizationName: string
+  organizationId: string
+}
+
+export interface ConsumableService {
+  id: string
+  name: string
+  description?: string
+  price: number
+  unit: string
+  organizationName: string
+  organizationId: string
+} 
\ No newline at end of file