6.17.2: Навигация закупки и next_show_at для товара

play-life-web/src/App.jsx

@@ -1041,7 +1041,7 @@ function AppContent() {
       }
 
       // Обновляем список товаров при возврате из экрана редактирования
-      if ((activeTab === 'shopping-item-form' || activeTab === 'shopping-board-form') && tab === 'shopping') {
+      if ((activeTab === 'shopping-item-form' || activeTab === 'shopping-board-form') && (tab === 'shopping' || tab === 'purchase')) {
         const savedBoardId = params.boardId || tabParams.boardId
         if (savedBoardId) {
           setTabParams(prev => ({ ...prev, boardId: savedBoardId }))
@@ -1428,6 +1428,7 @@ function AppContent() {
                 onNavigate={handleNavigate}
                 itemId={tabParams.itemId}
                 boardId={tabParams.boardId}
+                previousTab={previousTab}
                 onSaved={() => setShoppingRefreshTrigger(prev => prev + 1)}
               />
             </div>

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

@@ -5,7 +5,7 @@ import SubmitButton from './SubmitButton'
 import DeleteButton from './DeleteButton'
 import './ShoppingItemForm.css'
 
-function ShoppingItemForm({ onNavigate, itemId, boardId, onSaved }) {
+function ShoppingItemForm({ onNavigate, itemId, boardId, previousTab, onSaved }) {
   const { authFetch } = useAuth()
   const [name, setName] = useState('')
   const [description, setDescription] = useState('')
@@ -132,7 +132,7 @@ function ShoppingItemForm({ onNavigate, itemId, boardId, onSaved }) {
 
       if (res.ok) {
         onSaved?.()
-        onNavigate('shopping', { boardId })
+        onNavigate(previousTab || 'shopping', { boardId })
       } else {
         const err = await res.json()
         setToastMessage({ text: err.error || 'Ошибка сохранения', type: 'error' })
@@ -152,7 +152,7 @@ function ShoppingItemForm({ onNavigate, itemId, boardId, onSaved }) {
       const res = await authFetch(`/api/shopping/items/${itemId}`, { method: 'DELETE' })
       if (res.ok) {
         onSaved?.()
-        onNavigate('shopping', { boardId })
+        onNavigate(previousTab || 'shopping', { boardId })
       } else {
         setToastMessage({ text: 'Ошибка удаления', type: 'error' })
         setIsDeleting(false)