6.14.0: Еженедельное подтверждение приоритетов

play-life-web/src/components/ProjectPriorityManager.jsx

@@ -27,10 +27,10 @@ import './Integrations.css'
 
 // API endpoints (используем относительные пути, проксирование настроено в nginx/vite)
 const PROJECTS_API_URL = '/projects'
-const PRIORITY_UPDATE_API_URL = '/project/priority'
 const PROJECT_COLOR_API_URL = '/project/color'
 const PROJECT_MOVE_API_URL = '/project/move'
 const PROJECT_CREATE_API_URL = '/project/create'
+const PRIORITIES_CONFIRM_API_URL = '/priorities/confirm'
 
 // Компонент экрана добавления проекта
 function AddProjectScreen({ onClose, onSuccess, onError }) {
@@ -387,13 +387,14 @@ function PrioritySlot({ title, projects, allProjects, onMenuClick, maxItems = nu
   )
 }
 
-function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad, onLoadingChange, onErrorChange, refreshTrigger, onNavigate }) {
+function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad, onLoadingChange, onErrorChange, refreshTrigger, onNavigate, onConfirmed, onClose }) {
   const { authFetch } = useAuth()
   const [projectsLoading, setProjectsLoading] = useState(false)
   const [projectsError, setProjectsError] = useState(null)
   const [hasDataCache, setHasDataCache] = useState(false) // Отслеживаем наличие кеша
   const [toastMessage, setToastMessage] = useState(null)
-  
+  const [isSaving, setIsSaving] = useState(false)
+
   // Уведомляем родительский компонент об изменении состояния загрузки
   useEffect(() => {
     if (onLoadingChange) {
@@ -421,9 +422,8 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
 
   const scrollContainerRef = useRef(null)
   const hasFetchedRef = useRef(false)
-  const skipNextEffectRef = useRef(false)
-  const lastRefreshTriggerRef = useRef(0) // Отслеживаем последний обработанный refreshTrigger
-  const isLoadingRef = useRef(false) // Отслеживаем, идет ли сейчас загрузка
+  const lastRefreshTriggerRef = useRef(0)
+  const isLoadingRef = useRef(false)
 
   const sensors = useSensors(
     useSensor(PointerSensor, {
@@ -608,60 +608,30 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
     return map
   }, [lowPriority, maxPriority, mediumPriority])
 
-  const prevAssignmentsRef = useRef(new Map())
-  const initializedAssignmentsRef = useRef(false)
+  const handleSave = useCallback(async () => {
+    const assignments = buildAssignments()
+    const changes = []
+    assignments.forEach(({ id, priority }) => {
+      if (id) changes.push({ id, priority })
+    })
 
-  const sendPriorityChanges = useCallback(async (changes) => {
-    if (!changes.length) return
+    setIsSaving(true)
     try {
-      await authFetch(PRIORITY_UPDATE_API_URL, {
+      const response = await authFetch(PRIORITIES_CONFIRM_API_URL, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(changes),
       })
-    } catch (e) {
-      console.error('Ошибка отправки изменений приоритета', e)
-    }
-  }, [])
-
-  useEffect(() => {
-    const current = buildAssignments()
-
-    if (!initializedAssignmentsRef.current) {
-      prevAssignmentsRef.current = current
-      initializedAssignmentsRef.current = true
-      return
-    }
-
-    if (skipNextEffectRef.current) {
-      skipNextEffectRef.current = false
-      prevAssignmentsRef.current = current
-      return
-    }
-
-    const prev = prevAssignmentsRef.current
-    const allKeys = new Set([...prev.keys(), ...current.keys()])
-    const changes = []
-
-    allKeys.forEach(key => {
-      const prevItem = prev.get(key)
-      const currItem = current.get(key)
-      const prevPriority = prevItem?.priority ?? null
-      const currPriority = currItem?.priority ?? null
-      const id = currItem?.id ?? prevItem?.id
-
-      if (!id) return
-      if (prevPriority !== currPriority) {
-        changes.push({ id, priority: currPriority })
+      if (!response.ok) {
+        throw new Error('Ошибка сохранения')
       }
-    })
-
-    if (changes.length) {
-      sendPriorityChanges(changes)
+      if (onConfirmed) onConfirmed()
+    } catch (e) {
+      setToastMessage({ text: e.message || 'Ошибка сохранения', type: 'error' })
+    } finally {
+      setIsSaving(false)
     }
-
-    prevAssignmentsRef.current = current
-  }, [buildAssignments, sendPriorityChanges])
+  }, [authFetch, buildAssignments, onConfirmed])
 
   const findProjectContainer = (projectName) => {
     if (maxPriority.find(p => p.name === projectName)) return 'max'
@@ -919,9 +889,9 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
 
   return (
     <div className="max-w-2xl mx-auto flex flex-col h-full">
-      {onNavigate && (
+      {(onNavigate || onClose) && (
         <button
-          onClick={() => window.history.back()}
+          onClick={() => onClose ? onClose() : window.history.back()}
           className="close-x-button"
           title="Закрыть"
         >
@@ -1090,6 +1060,21 @@ function ProjectPriorityManager({ allProjectsData, currentWeekData, shouldLoad,
         />
       )}
 
+      <div className={onClose
+        ? 'sticky bottom-0 pt-2 pb-4 mt-2'
+        : 'fixed bottom-0 left-0 right-0 bg-gray-100 px-4 pt-2 pb-4'
+      }>
+        <div className="max-w-2xl mx-auto">
+          <button
+            onClick={handleSave}
+            disabled={isSaving}
+            className="w-full py-3 bg-indigo-600 hover:bg-indigo-700 disabled:bg-indigo-400 text-white font-semibold rounded-lg shadow transition-all"
+          >
+            {isSaving ? 'Сохранение...' : 'Сохранить'}
+          </button>
+        </div>
+      </div>
+
       {toastMessage && (
         <Toast
           message={toastMessage.text}