diff --git a/src/app/components/settings/SettingsPage.tsx b/src/app/components/settings/SettingsPage.tsx index 91e4f185..6e082876 100644 --- a/src/app/components/settings/SettingsPage.tsx +++ b/src/app/components/settings/SettingsPage.tsx @@ -540,6 +540,7 @@ export default function SettingsPage() { // Replace Jira API token panel const [showReplaceJiraToken, setShowReplaceJiraToken] = createSignal(false); + const [highlightReplaceJiraToken, setHighlightReplaceJiraToken] = createSignal(false); const [replaceJiraEmail, setReplaceJiraEmail] = createSignal(""); const [replaceJiraTokenInput, setReplaceJiraTokenInput] = createSignal(""); const [replaceJiraError, setReplaceJiraError] = createSignal(null); @@ -547,12 +548,27 @@ export default function SettingsPage() { let replaceJiraTokenInputRef: HTMLInputElement | undefined; let replaceJiraButtonRef: HTMLButtonElement | undefined; let replaceJiraAbortCtrl: AbortController | undefined; + let replaceJiraHighlightTimer: ReturnType | undefined; + let replaceJiraDeepLinkTimer: ReturnType | undefined; + + function triggerReplaceJiraHighlight() { + clearTimeout(replaceJiraHighlightTimer); + setHighlightReplaceJiraToken(true); + replaceJiraHighlightTimer = setTimeout(() => { + setHighlightReplaceJiraToken(false); + }, 1500); + } - function openReplaceJiraTokenPanel(focusInput = true) { - setReplaceJiraEmail(jiraAuth()?.email ?? config.jira?.email ?? ""); - setReplaceJiraTokenInput(""); - setReplaceJiraError(null); - setShowReplaceJiraToken(true); + function openReplaceJiraTokenPanel(focusInput = true, pulse = false) { + if (!showReplaceJiraToken()) { + setReplaceJiraEmail(jiraAuth()?.email ?? config.jira?.email ?? ""); + setReplaceJiraTokenInput(""); + setReplaceJiraError(null); + setShowReplaceJiraToken(true); + } + if (pulse) { + triggerReplaceJiraHighlight(); + } if (focusInput) { setTimeout(() => replaceJiraTokenInputRef?.focus(), 0); } @@ -560,6 +576,8 @@ export default function SettingsPage() { function closeReplaceJiraTokenPanel(restoreFocus = false) { replaceJiraAbortCtrl?.abort(); + clearTimeout(replaceJiraHighlightTimer); + setHighlightReplaceJiraToken(false); setShowReplaceJiraToken(false); setReplaceJiraTokenInput(""); setReplaceJiraError(null); @@ -571,7 +589,7 @@ export default function SettingsPage() { const shouldOpenReplace = config.jira?.authMethod === "token" && (isJiraAuthenticated() || Boolean(config.jira?.enabled)); if (shouldOpenReplace) { - openReplaceJiraTokenPanel(false); + openReplaceJiraTokenPanel(false, true); } setTimeout(() => { document.getElementById("jira")?.scrollIntoView?.({ behavior: "smooth", block: "start" }); @@ -581,15 +599,31 @@ export default function SettingsPage() { }, 0); } + function handleJiraDeepLinkClick(e: MouseEvent) { + const target = e.target as Element | null; + if (target?.closest?.('a[href="/settings#jira"]')) { + clearTimeout(replaceJiraDeepLinkTimer); + replaceJiraDeepLinkTimer = setTimeout(handleJiraDeepLink, 0); + } + } + onMount(() => { handleJiraDeepLink(); + // @solidjs/router commits window.history.pushState in a .finally() microtask + // after mounting the route component on SPA link clicks (), + // so re-check on the next macrotask once window.location.hash has settled. + replaceJiraDeepLinkTimer = setTimeout(handleJiraDeepLink, 0); window.addEventListener("hashchange", handleJiraDeepLink); + document.addEventListener("click", handleJiraDeepLinkClick); }); onCleanup(() => { replaceJiraAbortCtrl?.abort(); + clearTimeout(replaceJiraHighlightTimer); + clearTimeout(replaceJiraDeepLinkTimer); if (typeof window !== "undefined") { window.removeEventListener("hashchange", handleJiraDeepLink); + document.removeEventListener("click", handleJiraDeepLinkClick); } }); @@ -1572,6 +1606,15 @@ export default function SettingsPage() { ? "Your Jira API token has expired or is invalid. Replace your token below to resume syncing — all your Jira settings are preserved." : "Your Jira OAuth session has expired. Reconnect below to resume syncing — all your Jira settings are preserved."} + + +