6.19.3: Навигация на редактирование из диалога задачи
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 1m15s
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 1m15s
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "play-life-web",
|
||||
"version": "6.19.2",
|
||||
"version": "6.19.3",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -204,6 +204,7 @@ function FullStatistics({ selectedProject, onClearSelection, data, loading, erro
|
||||
fetchCurrentWeekData && fetchCurrentWeekData(true)
|
||||
onRetry && onRetry(true)
|
||||
}}
|
||||
onNavigate={onNavigate}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -348,7 +348,7 @@ function EditEntryModal({ entry, onClose, onSuccess, authFetch }) {
|
||||
: modalContent
|
||||
}
|
||||
|
||||
function TodayEntriesList({ data, loading, error, onRetry, onDelete }) {
|
||||
function TodayEntriesList({ data, loading, error, onRetry, onDelete, onNavigate }) {
|
||||
const { authFetch } = useAuth()
|
||||
const [deletingIds, setDeletingIds] = useState(new Set())
|
||||
const [selectedTaskId, setSelectedTaskId] = useState(null)
|
||||
@@ -390,10 +390,11 @@ function TodayEntriesList({ data, loading, error, onRetry, onDelete }) {
|
||||
setSelectedTaskId(taskId)
|
||||
}
|
||||
|
||||
const handleCloseTaskDetail = () => {
|
||||
if (historyPushedRef.current) {
|
||||
const handleCloseTaskDetail = (skipHistoryBack = false) => {
|
||||
if (!skipHistoryBack && historyPushedRef.current) {
|
||||
window.history.back()
|
||||
} else {
|
||||
historyPushedRef.current = false
|
||||
setSelectedTaskId(null)
|
||||
}
|
||||
}
|
||||
@@ -606,6 +607,7 @@ function TodayEntriesList({ data, loading, error, onRetry, onDelete }) {
|
||||
taskId={selectedTaskId}
|
||||
onClose={handleCloseTaskDetail}
|
||||
onRefresh={handleTaskSaved}
|
||||
onNavigate={onNavigate}
|
||||
/>
|
||||
)}
|
||||
{editingEntry && (
|
||||
|
||||
Reference in New Issue
Block a user