From de5b60907be7447c76fd4f2af7ab2ca513885a2d Mon Sep 17 00:00:00 2001
From: tlartem <tlartem@ya.ru>
Date: Sun, 27 Jul 2025 08:25:21 +0300
Subject: [PATCH] =?UTF-8?q?fix=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/api/templateApiService.ts        |  4 ++
 .../template/model/TemplateContext.tsx        | 30 ++++++++++---
 src/page/TemplatesOverviewPage.tsx            | 42 +++++++++++++------
 3 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/entitiy/template/api/templateApiService.ts b/src/entitiy/template/api/templateApiService.ts
index 6fbb555..b58e097 100644
--- a/src/entitiy/template/api/templateApiService.ts
+++ b/src/entitiy/template/api/templateApiService.ts
@@ -2,6 +2,10 @@ export interface CreateTemplateInput {
   name: string
   description?: string
   elements: Record<string, any>
+  attributes?: Array<{
+    attribute_id: string
+    value: string | null
+  }>
 }
 
 export interface CreateTemplateOutput {
diff --git a/src/entitiy/template/model/TemplateContext.tsx b/src/entitiy/template/model/TemplateContext.tsx
index f9be20a..cc4070c 100644
--- a/src/entitiy/template/model/TemplateContext.tsx
+++ b/src/entitiy/template/model/TemplateContext.tsx
@@ -28,7 +28,8 @@ interface TemplateContextType {
   error: Error | null
   refetchTemplates: () => void
   addTemplate: (
-    data: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>
+    data: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>,
+    attributes?: Array<{ attributeId: string; value: string | null }>
   ) => Promise<Template>
   updateTemplate: (
     template: Template,
@@ -66,10 +67,20 @@ export const TemplateProvider: React.FC<{ children: ReactNode }> = ({
   })
 
   const createMutation = useMutation({
-    mutationFn: async (
-      newTemplate: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>
-    ) => {
-      const input = templateToCreateInput(newTemplate)
+    mutationFn: async ({
+      template,
+      attributes,
+    }: {
+      template: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>
+      attributes?: Array<{ attributeId: string; value: string | null }>
+    }) => {
+      const input = templateToCreateInput(template)
+      if (attributes && attributes.length > 0) {
+        input.attributes = attributes.map(attr => ({
+          attribute_id: attr.attributeId,
+          value: attr.value,
+        }))
+      }
       const { id } = await createTemplateApi(input)
       const { template: apiTpl } = await getTemplateApi(id)
       if (!apiTpl) throw new Error('Template not found')
@@ -172,7 +183,14 @@ export const TemplateProvider: React.FC<{ children: ReactNode }> = ({
         (copyMutation.error as Error) ||
         null,
       refetchTemplates: refetch,
-      addTemplate: createMutation.mutateAsync,
+      addTemplate: async (
+        template: Omit<Template, 'id' | 'createdAt' | 'updatedAt'>,
+        attributes?: Array<{ attributeId: string; value: string | null }>
+      ) =>
+        createMutation.mutateAsync({
+          template,
+          attributes,
+        }),
       updateTemplate: async (
         template: Template,
         attributes?: Array<{ attributeId: string; value: string | null }>
diff --git a/src/page/TemplatesOverviewPage.tsx b/src/page/TemplatesOverviewPage.tsx
index bffda4c..cdc156f 100644
--- a/src/page/TemplatesOverviewPage.tsx
+++ b/src/page/TemplatesOverviewPage.tsx
@@ -118,7 +118,7 @@ interface TemplateFormProps {
   attributeValues: AttributeValue[]
   onAttributeValuesChange: (values: AttributeValue[]) => void
   attributesLoading: boolean
-  onSubmit: () => void
+  onSubmit: () => void | Promise<void>
   onCancel: () => void
   submitText: string
   submitIcon: React.ReactNode
@@ -229,7 +229,14 @@ const TemplateForm: React.FC<TemplateFormProps> = ({
             <Button variant="outline">Отмена</Button>
           </DialogClose>
           <Button
-            onClick={onSubmit}
+            onClick={() => {
+              const result = onSubmit()
+              if (result instanceof Promise) {
+                result.catch(error => {
+                  console.error('Ошибка при выполнении операции:', error)
+                })
+              }
+            }}
             disabled={isSubmitDisabled}
             className="min-w-[130px]"
           >
@@ -319,18 +326,27 @@ export const TemplatesOverviewPage = () => {
     setSelectionMode(false)
   }
 
-  const handleCreate = () => {
+  const handleCreate = async () => {
     if (newName.trim()) {
-      addTemplate({
-        name: newName,
-        elements: [],
-        description: newDescription,
-        mergedCells: [],
-      })
-      setNewName('')
-      setNewDescription('')
-      setNewAttributeValues([])
-      setIsDialogOpen(false)
+      try {
+        // Создаем шаблон с атрибутами сразу
+        await addTemplate(
+          {
+            name: newName,
+            elements: [],
+            description: newDescription,
+            mergedCells: [],
+          },
+          newAttributeValues.length > 0 ? newAttributeValues : undefined
+        )
+
+        setNewName('')
+        setNewDescription('')
+        setNewAttributeValues([])
+        setIsDialogOpen(false)
+      } catch (error) {
+        console.error('Ошибка при создании шаблона:', error)
+      }
     }
   }