From 37ed795ad105a3df7ee77f77c60e46458298b4a6 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 25 Mar 2025 23:00:50 +0300
Subject: [PATCH] M: Improve fullname label and fix clone defaults

---
 .../apps/library/tests/s_views/t_library.py     |  2 +-
 rsconcept/backend/apps/library/views/library.py |  2 +-
 .../library/dialogs/dlg-clone-library-item.tsx  |  2 +-
 .../pages/create-item-page/form-create-item.tsx |  2 +-
 .../tab-input-operation.tsx                     |  2 +-
 .../tab-synthesis-operation.tsx                 |  2 +-
 .../dlg-edit-operation/tab-operation.tsx        |  2 +-
 .../pages/oss-page/editor-oss-card/form-oss.tsx |  2 +-
 .../editor-rsform-card/form-rsform.tsx          | 17 ++++++++++-------
 9 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/rsconcept/backend/apps/library/tests/s_views/t_library.py b/rsconcept/backend/apps/library/tests/s_views/t_library.py
index 32403005..9cff6e94 100644
--- a/rsconcept/backend/apps/library/tests/s_views/t_library.py
+++ b/rsconcept/backend/apps/library/tests/s_views/t_library.py
@@ -359,7 +359,7 @@ class TestLibraryViewset(EndpointTester):
         data = {'title': 'Title1340', 'items': []}
         response = self.executeCreated(data=data, item=self.owned.pk)
         self.assertEqual(response.data['title'], data['title'])
-        self.assertEqual(len(response.data['items']), 0)
+        self.assertEqual(len(response.data['items']), 2)
 
         data = {'title': 'Title1341', 'items': [x12.pk]}
         response = self.executeCreated(data=data, item=self.owned.pk)
diff --git a/rsconcept/backend/apps/library/views/library.py b/rsconcept/backend/apps/library/views/library.py
index 2a176c48..4bd0996e 100644
--- a/rsconcept/backend/apps/library/views/library.py
+++ b/rsconcept/backend/apps/library/views/library.py
@@ -168,7 +168,7 @@ class LibraryViewSet(viewsets.ModelViewSet):
 
         with transaction.atomic():
             clone.save()
-            need_filter = 'items' in request.data
+            need_filter = 'items' in request.data and len(request.data['items']) > 0
             for cst in RSForm(item).constituents():
                 if not need_filter or cst.pk in request.data['items']:
                     cst.pk = None
diff --git a/rsconcept/frontend/src/features/library/dialogs/dlg-clone-library-item.tsx b/rsconcept/frontend/src/features/library/dialogs/dlg-clone-library-item.tsx
index 2da57c84..063269b0 100644
--- a/rsconcept/frontend/src/features/library/dialogs/dlg-clone-library-item.tsx
+++ b/rsconcept/frontend/src/features/library/dialogs/dlg-clone-library-item.tsx
@@ -68,7 +68,7 @@ export function DlgCloneLibraryItem() {
     >
       <TextInput
         id='dlg_full_name' //
-        label='Полное название'
+        label='Название'
         {...register('title')}
         error={errors.title}
       />
diff --git a/rsconcept/frontend/src/features/library/pages/create-item-page/form-create-item.tsx b/rsconcept/frontend/src/features/library/pages/create-item-page/form-create-item.tsx
index 3f8eb873..7bf4a1a3 100644
--- a/rsconcept/frontend/src/features/library/pages/create-item-page/form-create-item.tsx
+++ b/rsconcept/frontend/src/features/library/pages/create-item-page/form-create-item.tsx
@@ -137,7 +137,7 @@ export function FormCreateItem() {
       <TextInput
         id='schema_title'
         {...register('title')}
-        label='Полное название'
+        label='Название'
         placeholder={file && 'Загрузить из файла'}
         error={errors.title}
       />
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx
index af5e1842..7cdd76c4 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx
@@ -56,7 +56,7 @@ export function TabInputOperation() {
     <div className='cc-fade-in cc-column'>
       <TextInput
         id='operation_title' //
-        label='Полное название'
+        label='Название'
         {...register('item_data.title')}
         error={errors.item_data?.title}
       />
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx
index ed86395f..809677c0 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx
@@ -21,7 +21,7 @@ export function TabSynthesisOperation() {
     <div className='cc-fade-in cc-column'>
       <TextInput
         id='operation_title'
-        label='Полное название'
+        label='Название'
         {...register('item_data.title')}
         error={errors.item_data?.title}
       />
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx
index 61c8f6e3..cf1226c0 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx
@@ -14,7 +14,7 @@ export function TabOperation() {
     <div className='cc-fade-in cc-column'>
       <TextInput
         id='operation_title'
-        label='Полное название'
+        label='Названиее'
         {...register('item_data.title')}
         error={errors.item_data?.title}
       />
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
index afdacc5d..d7cce097 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-card/form-oss.tsx
@@ -63,7 +63,7 @@ export function FormOSS() {
       <TextInput
         id='schema_title'
         {...register('title')}
-        label='Полное название'
+        label='Название'
         className='mb-3'
         error={errors.title}
         disabled={!isMutable}
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
index 52f25986..4740d5c3 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/form-rsform.tsx
@@ -41,8 +41,13 @@ export function FormRSForm() {
     reset,
     formState: { isDirty, errors }
   } = useForm<IUpdateLibraryItemDTO>({
-    resolver: zodResolver(schemaUpdateLibraryItem),
-    defaultValues: {
+    resolver: zodResolver(schemaUpdateLibraryItem)
+  });
+  const visible = useWatch({ control, name: 'visible' });
+  const readOnly = useWatch({ control, name: 'read_only' });
+
+  useEffect(() => {
+    reset({
       id: schema.id,
       item_type: LibraryItemType.RSFORM,
       title: schema.title,
@@ -50,10 +55,8 @@ export function FormRSForm() {
       description: schema.description,
       visible: schema.visible,
       read_only: schema.read_only
-    }
-  });
-  const visible = useWatch({ control, name: 'visible' });
-  const readOnly = useWatch({ control, name: 'read_only' });
+    });
+  }, [schema, reset]);
 
   useEffect(() => {
     setIsModified(isDirty);
@@ -76,7 +79,7 @@ export function FormRSForm() {
       <TextInput
         id='schema_title'
         {...register('title')}
-        label='Полное название'
+        label='Название'
         className='mb-3'
         error={errors.title}
         disabled={!isContentEditable}