6.15.3: Фикс обновления данных при редактировании завершённого желания
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m7s
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m7s
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "play-life-web",
|
"name": "play-life-web",
|
||||||
"version": "6.15.2",
|
"version": "6.15.3",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -1080,6 +1080,11 @@ function AppContent() {
|
|||||||
setWordsRefreshTrigger(prev => prev + 1)
|
setWordsRefreshTrigger(prev => prev + 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Обновляем список желаний при возврате из формы редактирования
|
||||||
|
if (prevActiveTabRef.current === 'wishlist-form' && activeTab === 'wishlist') {
|
||||||
|
setWishlistRefreshTrigger(prev => prev + 1)
|
||||||
|
}
|
||||||
|
|
||||||
if (isFirstLoad) {
|
if (isFirstLoad) {
|
||||||
// Первая загрузка таба
|
// Первая загрузка таба
|
||||||
lastLoadedTabRef.current = tabKey
|
lastLoadedTabRef.current = tabKey
|
||||||
|
|||||||
@@ -338,7 +338,7 @@ function Wishlist({ onNavigate, refreshTrigger = 0, isActive = false, initialBoa
|
|||||||
}
|
}
|
||||||
fetchBoards()
|
fetchBoards()
|
||||||
fetchItems(selectedBoardId)
|
fetchItems(selectedBoardId)
|
||||||
if (completedExpanded && completedCount > 0) {
|
if (completedExpanded) {
|
||||||
fetchCompleted(selectedBoardId)
|
fetchCompleted(selectedBoardId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -809,6 +809,7 @@ function Wishlist({ onNavigate, refreshTrigger = 0, isActive = false, initialBoa
|
|||||||
wishlistId={selectedWishlistForDetail}
|
wishlistId={selectedWishlistForDetail}
|
||||||
onNavigate={onNavigate}
|
onNavigate={onNavigate}
|
||||||
boardId={selectedBoardId}
|
boardId={selectedBoardId}
|
||||||
|
refreshTrigger={refreshTrigger}
|
||||||
onRefresh={async () => {
|
onRefresh={async () => {
|
||||||
await fetchItems(selectedBoardId)
|
await fetchItems(selectedBoardId)
|
||||||
if (completedExpanded) {
|
if (completedExpanded) {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import './TaskList.css'
|
|||||||
|
|
||||||
const API_URL = '/api/wishlist'
|
const API_URL = '/api/wishlist'
|
||||||
|
|
||||||
function WishlistDetail({ wishlistId, onNavigate, onRefresh, boardId, onClose, previousTab }) {
|
function WishlistDetail({ wishlistId, onNavigate, onRefresh, boardId, onClose, previousTab, refreshTrigger = 0 }) {
|
||||||
const { authFetch, user } = useAuth()
|
const { authFetch, user } = useAuth()
|
||||||
const [wishlistItem, setWishlistItem] = useState(null)
|
const [wishlistItem, setWishlistItem] = useState(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
@@ -51,6 +51,12 @@ function WishlistDetail({ wishlistId, onNavigate, onRefresh, boardId, onClose, p
|
|||||||
}
|
}
|
||||||
}, [wishlistId, fetchWishlistDetail])
|
}, [wishlistId, fetchWishlistDetail])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (refreshTrigger > 0 && wishlistId) {
|
||||||
|
fetchWishlistDetail()
|
||||||
|
}
|
||||||
|
}, [refreshTrigger])
|
||||||
|
|
||||||
const handleEdit = () => {
|
const handleEdit = () => {
|
||||||
// Сбрасываем флаг, чтобы handleClose не вызвал history.back()
|
// Сбрасываем флаг, чтобы handleClose не вызвал history.back()
|
||||||
// handleTabChange заменит запись модального окна через replaceState
|
// handleTabChange заменит запись модального окна через replaceState
|
||||||
|
|||||||
Reference in New Issue
Block a user