Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions frontend/src/components/layout/AppLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from "react"
import { Outlet } from "react-router"
import { useEffect, useRef, useState, useCallback } from "react"
import { Outlet, useSearchParams } from "react-router"
import { AppSidebar } from "./Sidebar"
import { Header } from "./Header"
import { SettingsDialog } from "@/components/SettingsDialog"
Expand All @@ -11,13 +11,34 @@ import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"
function AppLayoutInner() {
const [settingsOpen, setSettingsOpen] = useState(false)
const [settingsTab, setSettingsTab] = useState("profile")
const [searchParams, setSearchParams] = useSearchParams()
const commandPalette = useCommandPalette()
const { openUpload, dialogOpen } = useUploadContext()

const openSettings = (tab = "profile") => {
const openSettings = useCallback((tab = "profile") => {
setSettingsTab(tab)
setSettingsOpen(true)
}
}, [])

// Auto-open settings from URL params (e.g. OAuth redirect)
useEffect(() => {
const tab = searchParams.get("settings")
if (tab) {
openSettings(tab)
searchParams.delete("settings")
setSearchParams(searchParams, { replace: true })
}
}, []) // eslint-disable-line react-hooks/exhaustive-deps

// Listen for open-settings events from other components
useEffect(() => {
const handler = (e: Event) => {
const detail = (e as CustomEvent).detail
openSettings(detail?.tab || "profile")
}
window.addEventListener("open-settings", handler)
return () => window.removeEventListener("open-settings", handler)
}, [openSettings])

// Refs for dialog state — read inside keydown handler without re-subscribing
const settingsOpenRef = useRef(settingsOpen)
Expand Down
31 changes: 15 additions & 16 deletions frontend/src/components/settings/YouTubeSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Input } from "@/components/ui/input"
import { Button } from "@/components/ui/button"
import { Label } from "@/components/ui/label"
import { Skeleton } from "@/components/ui/skeleton"
import { Spinner } from "@/components/ui/spinner"

interface YouTubeStatus {
connected: boolean
Expand All @@ -17,6 +18,7 @@ export function YouTubeSection() {
const [searchParams, setSearchParams] = useSearchParams()
const [clientId, setClientId] = useState("")
const [clientSecret, setClientSecret] = useState("")
const [isFinalizing, setIsFinalizing] = useState(false)

const {
data: statusData,
Expand All @@ -39,7 +41,7 @@ export function YouTubeSection() {
)

const { call: callConnect, loading: connecting } = useFrappePostCall("vms.youtube.connect_youtube")
const { call: callFinalize, loading: finalizing } = useFrappePostCall("vms.youtube.finalize_youtube_connection")
const { call: callFinalize } = useFrappePostCall("vms.youtube.finalize_youtube_connection")
const { call: callDisconnect, loading: disconnecting } = useFrappePostCall("vms.youtube.disconnect_youtube")

const status = statusData?.message
Expand All @@ -49,9 +51,9 @@ export function YouTubeSection() {
useEffect(() => {
if (searchParams.get("youtube_connected") === "1") {
searchParams.delete("youtube_connected")
searchParams.delete("settings")
setSearchParams(searchParams, { replace: true })

setIsFinalizing(true)
callFinalize({})
.then(() => {
toast.success("YouTube connected successfully")
Expand All @@ -60,6 +62,9 @@ export function YouTubeSection() {
.catch(() => {
toast.error("Failed to finalize YouTube connection")
})
.finally(() => {
setIsFinalizing(false)
})
}
}, []) // eslint-disable-line react-hooks/exhaustive-deps

Expand Down Expand Up @@ -94,19 +99,13 @@ export function YouTubeSection() {
}
}

if (statusLoading || redirectLoading) {
if (isFinalizing || statusLoading || redirectLoading) {
return (
<div className="p-4 md:p-6 space-y-6">
<div className="space-y-4">
<div className="space-y-1">
<Skeleton className="h-4 w-28" />
<Skeleton className="h-3 w-48" />
</div>
<div className="grid gap-3 sm:grid-cols-2">
<Skeleton className="h-9 w-full rounded-md" />
<Skeleton className="h-9 w-full rounded-md" />
</div>
</div>
<div className="flex flex-1 flex-col items-center justify-center gap-3 p-8">
<Spinner className="size-5" />
<p className="text-sm text-muted-foreground">
{isFinalizing ? "Connecting YouTube..." : "Loading..."}
</p>
</div>
)
}
Expand Down Expand Up @@ -211,8 +210,8 @@ export function YouTubeSection() {
{disconnecting ? "Disconnecting..." : "Disconnect YouTube"}
</Button>
) : (
<Button onClick={handleConnect} disabled={connecting || finalizing}>
{connecting ? "Redirecting..." : finalizing ? "Finalizing..." : "Connect YouTube"}
<Button onClick={handleConnect} disabled={connecting}>
{connecting ? "Redirecting..." : "Connect YouTube"}
</Button>
)}
</div>
Expand Down
Loading