From 1b8faf549573268effce12daff64a3f03340474c Mon Sep 17 00:00:00 2001 From: Aamir Azad Date: Wed, 10 Jul 2024 21:23:51 -0400 Subject: [PATCH] Finally a few of the buttons are working --- .../recording/{[name] => [id]}/page.tsx | 4 +- .../recording/{[name] => [id]}/page.tsx | 4 +- src/components/audio-preview.tsx | 124 +++++++++++------- src/components/document-viewer.tsx | 2 +- 4 files changed, 82 insertions(+), 52 deletions(-) rename src/app/@modal/(.)whishper/recording/{[name] => [id]}/page.tsx (74%) rename src/app/whishper/recording/{[name] => [id]}/page.tsx (72%) diff --git a/src/app/@modal/(.)whishper/recording/[name]/page.tsx b/src/app/@modal/(.)whishper/recording/[id]/page.tsx similarity index 74% rename from src/app/@modal/(.)whishper/recording/[name]/page.tsx rename to src/app/@modal/(.)whishper/recording/[id]/page.tsx index 5033e33..2d7a01f 100644 --- a/src/app/@modal/(.)whishper/recording/[name]/page.tsx +++ b/src/app/@modal/(.)whishper/recording/[id]/page.tsx @@ -4,11 +4,11 @@ import AudioPreview from "@/components/audio-preview"; export default function ModalAudioPreview({ params, }: { - params: { name: string }; + params: { id: string }; }) { return ( - + ); } diff --git a/src/app/whishper/recording/[name]/page.tsx b/src/app/whishper/recording/[id]/page.tsx similarity index 72% rename from src/app/whishper/recording/[name]/page.tsx rename to src/app/whishper/recording/[id]/page.tsx index b65f9d1..7d8efbe 100644 --- a/src/app/whishper/recording/[name]/page.tsx +++ b/src/app/whishper/recording/[id]/page.tsx @@ -3,11 +3,11 @@ import AudioPreview from "@/components/audio-preview"; export default function FullAudioPage({ params, }: { - params: { name: string }; + params: { id: string }; }) { return (
- +
); } diff --git a/src/components/audio-preview.tsx b/src/components/audio-preview.tsx index 49585f6..01b846f 100644 --- a/src/components/audio-preview.tsx +++ b/src/components/audio-preview.tsx @@ -8,7 +8,7 @@ import { import type { UsersTableType } from "@/server/db/schema"; import { Button } from "@/components/ui/button"; import { useRouter } from "next/navigation"; -import { ChevronLeft, ExternalLink } from "lucide-react"; +import { ChevronLeft } from "lucide-react"; import { Tooltip, TooltipContent, @@ -16,9 +16,9 @@ import { TooltipTrigger, } from "@/components/ui/tooltip"; import { useState } from "react"; -import { getWhishperRecordings } from "@/app/whishper/page"; import OpenExternalLink from "./external-link"; -import { SimpleWhishperTranscription, WhishperRecordingType } from "@/types"; +import type { WhishperRecordingType } from "@/types"; +import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; const queryClient = new QueryClient(); @@ -56,11 +56,8 @@ function SkeletonLoader() { ); } -async function fetchWhishperRecording( - searchId: string, - userData: UsersTableType, -) { - const response = await fetch(`${userData.whishperURL}/api/transcriptions`); +async function fetchWhishperRecording(searchId: string, whishperURL: string) { + const response = await fetch(`${whishperURL}/api/transcriptions`); const data = (await response.json()) as WhishperRecordingType[]; for (const recording of data) { if (recording.id === searchId) { @@ -69,26 +66,65 @@ async function fetchWhishperRecording( } } -function AudioInfo(props: { id: string }) { +type AudioInfoProps = { + id: string; +}; + +function AudioInfo({ id }: AudioInfoProps) { const router = useRouter(); const [isPlaying, setIsPlaying] = useState(false); - const { data: userData, isLoading: isUserDataLoading } = useQuery({ + const { + data: userData, + isLoading: isUserDataLoading, + error: userDataError, + } = useQuery({ queryKey: ["userData"], queryFn: fetchUserData, }); - const { data: recordingData, isLoading: isRecordingDataLoading } = useQuery({ - queryKey: ["whishperRecording", props.idgt modify -cam "So close"], // Include id in the query key - queryFn: () => fetchWhishperRecording(props.id, userData), - enabled: !!userData, // Only fetch recording data when userData is available + const whishperURL = userData?.whishperURL; + + const { + data: recordingData, + isLoading: isRecordingDataLoading, + error: recordingDataError, + } = useQuery({ + queryKey: ["whishperRecording", id, whishperURL], // Include id in the query key + queryFn: () => fetchWhishperRecording(id, whishperURL!), + enabled: !!whishperURL, // Only fetch recording data when userData is available }); - if (isUserDataLoading ?? isRecordingDataLoading) { + if (isUserDataLoading) { return ; } - if (!userData?.whishperURL ?? !recordingData) { - return

Failed

; + + if (userDataError ?? !userData) { + return ( +
+
+

+ Error loading user data +

+
+
+ ); + } + + if (isRecordingDataLoading) { + return ; + } + + if (recordingDataError ?? !recordingData) { + return ( +
+
+

+ Error loading recording data +

+
+
+ ); } const decodedName = decodeURIComponent(recordingData.fileName); @@ -122,48 +158,41 @@ function AudioInfo(props: { id: string }) { onPause={() => setIsPlaying(false)} >
+ - - Comming soon! - - - - - - - Comming soon! - - - - - @@ -182,6 +211,7 @@ export default function AudioPreview({ id }: { id: string }) { return ( + ); } diff --git a/src/components/document-viewer.tsx b/src/components/document-viewer.tsx index b3e3c26..8b31740 100644 --- a/src/components/document-viewer.tsx +++ b/src/components/document-viewer.tsx @@ -144,7 +144,7 @@ function DocumentViewer(props: { id: number }) { if (!pdfUrl || !userData) { return (
-
+

Failed to get document