Merge pull request 'fix-form-4' (#56) from fix-form-4 into test

Reviewed-on: #56

web/src/components/RealtimeTable/Cell/EditCell/EditCell.jsx

@@ -101,6 +101,18 @@ const EditCell = memo(({ refCell, onChange, disabled, value, tableId, cellId, ta
     return () => observer.disconnect();
   }, [state.currentValue]);
 
+  useEffect(() => {
+    // Небольшая задержка для гарантии, что DOM полностью готов
+    const timeoutId = setTimeout(() => {
+      if (textareaRef.current && !disabled) {
+        textareaRef.current.focus();
+        textareaRef.current.select();
+      }
+    }, 50);
+
+    return () => clearTimeout(timeoutId);
+  }, [disabled]);
+
   const handleSave = useCallback(() => {
     const { currentValue } = state;
 

web/src/components/RealtimeTable/RealtimeTable.jsx

@@ -77,6 +77,7 @@ const RealtimeTable = ({ formType, formId, sheetName, direction, year }) => {
     error: wsError,
     updateCell: contextUpdateCell,
     addRow: contextAddRow,
+    deleteRow: contextDeleteRow,
     startEditing: contextStartEditing,
     addProgram: contextAddProgram,
     addProject: contextAddProject,

web/src/components/RealtimeTable/utils/cellUtils.js

@@ -84,12 +84,8 @@ export function updateCells(data, newRows) {
         ) {
           if (newData && typeof newData === "object") {
             Object.keys(newData).forEach((key) => {
-              if (row.data && row.data[key]) {
+              if (row.data && row.data[key] !== undefined) {
-                if (typeof row.data[key] === "object") {
+                row.data[key] = deepMerge(row.data[key], newData[key]);
-                  row.data[key] = deepMerge(row.data[key], newData[key]);
-                } else {
-                  row.data[key] = newData[key];
-                }
               } else if (row[key]) {
                 row[key] = newData[key];
               }
@@ -112,7 +108,6 @@ export function updateCells(data, newRows) {
 
     findAndUpdate(updatedRows);
   });
-
   return updatedRows;
 }
 

web/src/constants/constants.jsx

@@ -53,5 +53,6 @@ export const SHEET_NAME = {
   "AHR_UTILITY": "АХР Коммунальные услуги",
   "AHR_SECURITY": "АХР Безопасность",
   "OTCH9F": "Отчет 9ф",
-  "SMETA": "Смета"
+  "SMETA": "Смета",
+  'STRUCTURE': 'Структура'
 };

web/src/pages/ProjectsPage/ProjectsPage.jsx

@@ -76,7 +76,7 @@ export default function ProjectsPage() {
   useEffect(() => {
     if (!user) return;
     if (user.role_id == ROLES_NAME_ID.admin) {
-      SspApi.getAll({is_active: true}).then(data => {
+      SspApi.getAll({ is_active: true }).then(data => {
         if (data.success) {
           setProjectData(prev => ({
             ...prev, 'ССП/РФ': {
@@ -248,11 +248,9 @@ export default function ProjectsPage() {
           getItemId={(project) => project.id}
           getItemTitle={(project) => project.name || 'Проект'}
           extraActions={
-            user.role_id === ROLES_NAME_ID.admin && (
+            <PrimaryButton onClick={openModal} startIcon={<WhitePlus />} height='2.5rem' >
-              <PrimaryButton onClick={openModal} startIcon={<WhitePlus />} height='2.5rem' >
+              Создать проект
-                Создать проект
+            </PrimaryButton>
-              </PrimaryButton>
-            )
           }
           filterActions={
             <Box sx={{ display: 'flex', gap: 1.5, flexWrap: 'wrap', alignItems: 'center', height: '2.5rem' }}>