From e74ba450352f466958a23484cb3bd1a1b5d6750c Mon Sep 17 00:00:00 2001 From: QQ Date: Tue, 17 Nov 2026 08:27:13 +0800 Subject: [PATCH] Import apps/android/src/screens/automation-tasks-modal.tsx --- .../src/screens/automation-tasks-modal.tsx | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/apps/android/src/screens/automation-tasks-modal.tsx b/apps/android/src/screens/automation-tasks-modal.tsx index 3fcb149..8a97a81 100644 --- a/apps/android/src/screens/automation-tasks-modal.tsx +++ b/apps/android/src/screens/automation-tasks-modal.tsx @@ -2,7 +2,6 @@ import { useEffect, useMemo, useRef, useState, type RefObject } from 'react' import { ActivityIndicator, Dimensions, - Alert, Modal, Pressable, RefreshControl, @@ -12,6 +11,7 @@ import { TextInput, View, } from 'react-native' +import { Alert } from '../ui/alert' import { AlertCircle, ArrowLeft, @@ -173,6 +173,7 @@ export function AutomationTasksModal({ setFormMode(null) setEditSnapshot(null) setTimingDirty(false) + setSubmitting(false) formTokenRef.current++ } }, [visible, isNonNativeBackend, loadTasks]) @@ -505,6 +506,7 @@ export function AutomationTasksModal({ const openCreateForm = () => { formTokenRef.current++ + setSubmitting(false) setFormTitle('') setFormPrompt('') const defaultSid = (selectedSession && (selectedSession.backend === undefined || selectedSession.backend === 'harness')) @@ -532,6 +534,7 @@ export function AutomationTasksModal({ const openEditForm = (task: ScheduleCatalogEntry) => { formTokenRef.current++ + setSubmitting(false) const expected = extractExpectedRecord(task) const tz = task.timeZone || Intl.DateTimeFormat().resolvedOptions().timeZone || 'Asia/Shanghai' setEditSnapshot({ @@ -622,6 +625,7 @@ export function AutomationTasksModal({ let sid = targetSessionId if (formTargetMode === 'new') { const created = await createSession(formWorkspaceId || undefined) + if (formTokenRef.current !== currentToken) return sid = created ? useAppStore.getState().selectedSession?.sessionId ?? '' : '' } if (!sid) { @@ -774,10 +778,15 @@ export function AutomationTasksModal({ ) } + const openingLinkedRef = useRef(false) const handleOpenLinkedSession = async () => { - if (!linkedSession) return - onClose() - await onOpenSession(linkedSession) + if (!linkedSession || openingLinkedRef.current) return + openingLinkedRef.current = true + try { + await onOpenSession(linkedSession) + } finally { + openingLinkedRef.current = false + } } const formatFrequency = (task: ScheduleCatalogEntry): string => { @@ -851,8 +860,26 @@ export function AutomationTasksModal({ return { absolute, relative: `(${relative})` } } + const handleRequestClose = () => { + if (isNonNativeBackend) { + onClose() + return + } + if (formMode !== null) { + formTokenRef.current++ + setSubmitting(false) + setFormMode(null) + return + } + if (selectedTask !== undefined) { + setSelectedTaskId(null) + return + } + onClose() + } + return ( - + {/* Unsupported Backend View */} {isNonNativeBackend ? ( @@ -892,6 +919,7 @@ export function AutomationTasksModal({ accessibilityLabel={strings.common.cancel} onPress={() => { formTokenRef.current++ + setSubmitting(false) setFormMode(null) }} hitSlop={8} @@ -1133,6 +1161,7 @@ export function AutomationTasksModal({ accessibilityRole="button" onPress={() => { formTokenRef.current++ + setSubmitting(false) setFormMode(null) }} style={({ pressed }) => [styles.footerCancelBtn, pressed && styles.pressedBg]}