mirror of
https://github.com/Monadical-SAS/reflector.git
synced 2025-12-20 12:19:06 +00:00
fix: don't attempt to load waveform/mp3 if audio was deleted (#495)
This commit is contained in:
@@ -12,7 +12,7 @@ import FinalSummary from "./finalSummary";
|
|||||||
import TranscriptTitle from "../transcriptTitle";
|
import TranscriptTitle from "../transcriptTitle";
|
||||||
import Player from "../player";
|
import Player from "../player";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import { Flex, Grid, GridItem, Skeleton, Text } from "@chakra-ui/react";
|
import { Box, Flex, Grid, GridItem, Skeleton, Text } from "@chakra-ui/react";
|
||||||
|
|
||||||
type TranscriptDetails = {
|
type TranscriptDetails = {
|
||||||
params: {
|
params: {
|
||||||
@@ -29,10 +29,13 @@ export default function TranscriptDetails(details: TranscriptDetails) {
|
|||||||
const transcriptStatus = transcript.response?.status;
|
const transcriptStatus = transcript.response?.status;
|
||||||
const waiting = statusToRedirect.includes(transcriptStatus || "");
|
const waiting = statusToRedirect.includes(transcriptStatus || "");
|
||||||
|
|
||||||
const topics = useTopics(transcriptId);
|
|
||||||
const waveform = useWaveform(transcriptId, waiting);
|
|
||||||
const useActiveTopic = useState<Topic | null>(null);
|
|
||||||
const mp3 = useMp3(transcriptId, waiting);
|
const mp3 = useMp3(transcriptId, waiting);
|
||||||
|
const topics = useTopics(transcriptId);
|
||||||
|
const waveform = useWaveform(
|
||||||
|
transcriptId,
|
||||||
|
waiting || mp3.loading || mp3.audioDeleted === true,
|
||||||
|
);
|
||||||
|
const useActiveTopic = useState<Topic | null>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (waiting) {
|
if (waiting) {
|
||||||
@@ -76,23 +79,24 @@ export default function TranscriptDetails(details: TranscriptDetails) {
|
|||||||
mt={4}
|
mt={4}
|
||||||
mb={4}
|
mb={4}
|
||||||
>
|
>
|
||||||
{waveform.waveform &&
|
{!mp3.audioDeleted && (
|
||||||
mp3.media &&
|
<>
|
||||||
!mp3.audioDeleted &&
|
{waveform.waveform && mp3.media && topics.topics ? (
|
||||||
topics.topics ? (
|
<Player
|
||||||
<Player
|
topics={topics?.topics}
|
||||||
topics={topics?.topics}
|
useActiveTopic={useActiveTopic}
|
||||||
useActiveTopic={useActiveTopic}
|
waveform={waveform.waveform}
|
||||||
waveform={waveform.waveform}
|
media={mp3.media}
|
||||||
media={mp3.media}
|
mediaDuration={transcript.response.duration}
|
||||||
mediaDuration={transcript.response.duration}
|
/>
|
||||||
/>
|
) : !mp3.loading && (waveform.error || mp3.error) ? (
|
||||||
) : waveform.error ? (
|
<Box p={4} bg="red.100" borderRadius="md">
|
||||||
<div>error loading this recording</div>
|
<Text>Error loading this recording</Text>
|
||||||
) : mp3.audioDeleted ? (
|
</Box>
|
||||||
<div>Audio was deleted</div>
|
) : (
|
||||||
) : (
|
<Skeleton h={14} />
|
||||||
<Skeleton h={14} />
|
)}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
<Grid
|
<Grid
|
||||||
templateColumns={{ base: "minmax(0, 1fr)", md: "repeat(2, 1fr)" }}
|
templateColumns={{ base: "minmax(0, 1fr)", md: "repeat(2, 1fr)" }}
|
||||||
@@ -108,19 +112,24 @@ export default function TranscriptDetails(details: TranscriptDetails) {
|
|||||||
borderColor={"gray.bg"}
|
borderColor={"gray.bg"}
|
||||||
borderRadius={8}
|
borderRadius={8}
|
||||||
>
|
>
|
||||||
<GridItem
|
<GridItem colSpan={{ base: 1, md: 2 }}>
|
||||||
display="flex"
|
<Flex direction="column" gap={0}>
|
||||||
flexDir="row"
|
<Flex alignItems="center" gap={2}>
|
||||||
alignItems={"center"}
|
<TranscriptTitle
|
||||||
colSpan={{ base: 1, md: 2 }}
|
title={transcript.response.title || "Unnamed Transcript"}
|
||||||
>
|
transcriptId={transcriptId}
|
||||||
<TranscriptTitle
|
onUpdate={(newTitle) => {
|
||||||
title={transcript.response.title || "Unnamed Transcript"}
|
transcript.reload();
|
||||||
transcriptId={transcriptId}
|
}}
|
||||||
onUpdate={(newTitle) => {
|
/>
|
||||||
transcript.reload();
|
</Flex>
|
||||||
}}
|
{mp3.audioDeleted && (
|
||||||
/>
|
<Text fontSize="xs" color="gray.600" fontStyle="italic">
|
||||||
|
No audio is available because one or more participants didn't
|
||||||
|
consent to keep the audio
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
</Flex>
|
||||||
</GridItem>
|
</GridItem>
|
||||||
<TopicList
|
<TopicList
|
||||||
topics={topics.topics || []}
|
topics={topics.topics || []}
|
||||||
|
|||||||
@@ -55,8 +55,8 @@ export function TopicList({
|
|||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (activeTopic) scrollToTopic();
|
if (activeTopic && autoscroll) scrollToTopic();
|
||||||
}, [activeTopic]);
|
}, [activeTopic, autoscroll]);
|
||||||
|
|
||||||
// scroll top is not rounded, heights are, so exact match won't work.
|
// scroll top is not rounded, heights are, so exact match won't work.
|
||||||
// https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight#determine_if_an_element_has_been_totally_scrolled
|
// https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight#determine_if_an_element_has_been_totally_scrolled
|
||||||
@@ -105,8 +105,10 @@ export function TopicList({
|
|||||||
const requireLogin = featureEnabled("requireLogin");
|
const requireLogin = featureEnabled("requireLogin");
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setActiveTopic(topics[topics.length - 1]);
|
if (autoscroll) {
|
||||||
}, [topics]);
|
setActiveTopic(topics[topics.length - 1]);
|
||||||
|
}
|
||||||
|
}, [topics, autoscroll]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
|
|||||||
@@ -54,62 +54,65 @@ const useMp3 = (transcriptId: string, waiting?: boolean): Mp3Response => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!transcriptId || !api || later) return;
|
if (!transcriptId || !api || later) return;
|
||||||
|
|
||||||
let deleted: boolean | null = null;
|
let stopped = false;
|
||||||
|
let audioElement: HTMLAudioElement | null = null;
|
||||||
|
let handleCanPlay: (() => void) | null = null;
|
||||||
|
let handleError: (() => void) | null = null;
|
||||||
|
|
||||||
setTranscriptMetadataLoading(true);
|
setTranscriptMetadataLoading(true);
|
||||||
|
|
||||||
const audioElement = document.createElement("audio");
|
|
||||||
audioElement.src = `${api_url}/v1/transcripts/${transcriptId}/audio/mp3`;
|
|
||||||
audioElement.crossOrigin = "anonymous";
|
|
||||||
audioElement.preload = "auto";
|
|
||||||
|
|
||||||
const handleCanPlay = () => {
|
|
||||||
if (deleted) {
|
|
||||||
console.error(
|
|
||||||
"Illegal state: audio supposed to be deleted, but was loaded",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setAudioLoading(false);
|
|
||||||
setAudioLoadingError(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleError = () => {
|
|
||||||
setAudioLoading(false);
|
|
||||||
if (deleted) {
|
|
||||||
// we arrived here earlier, ignore
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setAudioLoadingError("Failed to load audio");
|
|
||||||
};
|
|
||||||
|
|
||||||
audioElement.addEventListener("canplay", handleCanPlay);
|
|
||||||
audioElement.addEventListener("error", handleError);
|
|
||||||
|
|
||||||
setMedia(audioElement);
|
|
||||||
|
|
||||||
setAudioLoading(true);
|
setAudioLoading(true);
|
||||||
|
|
||||||
let stopped = false;
|
// First fetch transcript info to check if audio is deleted
|
||||||
// Fetch transcript info in parallel
|
|
||||||
api
|
api
|
||||||
.v1TranscriptGet({ transcriptId })
|
.v1TranscriptGet({ transcriptId })
|
||||||
.then((transcript) => {
|
.then((transcript) => {
|
||||||
if (stopped) return;
|
if (stopped) {
|
||||||
deleted = transcript.audio_deleted || false;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const deleted = transcript.audio_deleted || false;
|
||||||
setAudioDeleted(deleted);
|
setAudioDeleted(deleted);
|
||||||
setTranscriptMetadataLoadingError(null);
|
setTranscriptMetadataLoadingError(null);
|
||||||
|
|
||||||
if (deleted) {
|
if (deleted) {
|
||||||
|
// Audio is deleted, don't attempt to load it
|
||||||
setMedia(null);
|
setMedia(null);
|
||||||
setAudioLoadingError(null);
|
setAudioLoadingError(null);
|
||||||
|
setAudioLoading(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Audio is not deleted, proceed to load it
|
||||||
|
audioElement = document.createElement("audio");
|
||||||
|
audioElement.src = `${api_url}/v1/transcripts/${transcriptId}/audio/mp3`;
|
||||||
|
audioElement.crossOrigin = "anonymous";
|
||||||
|
audioElement.preload = "auto";
|
||||||
|
|
||||||
|
handleCanPlay = () => {
|
||||||
|
if (stopped) return;
|
||||||
|
setAudioLoading(false);
|
||||||
|
setAudioLoadingError(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
handleError = () => {
|
||||||
|
if (stopped) return;
|
||||||
|
setAudioLoading(false);
|
||||||
|
setAudioLoadingError("Failed to load audio");
|
||||||
|
};
|
||||||
|
|
||||||
|
audioElement.addEventListener("canplay", handleCanPlay);
|
||||||
|
audioElement.addEventListener("error", handleError);
|
||||||
|
|
||||||
|
if (!stopped) {
|
||||||
|
setMedia(audioElement);
|
||||||
}
|
}
|
||||||
// if deleted, media will or already returned error
|
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
if (stopped) return;
|
if (stopped) return;
|
||||||
console.error("Failed to fetch transcript:", error);
|
console.error("Failed to fetch transcript:", error);
|
||||||
setAudioDeleted(null);
|
setAudioDeleted(null);
|
||||||
setTranscriptMetadataLoadingError(error.message);
|
setTranscriptMetadataLoadingError(error.message);
|
||||||
|
setAudioLoading(false);
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
if (stopped) return;
|
if (stopped) return;
|
||||||
@@ -118,10 +121,14 @@ const useMp3 = (transcriptId: string, waiting?: boolean): Mp3Response => {
|
|||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
stopped = true;
|
stopped = true;
|
||||||
audioElement.removeEventListener("canplay", handleCanPlay);
|
if (audioElement) {
|
||||||
audioElement.removeEventListener("error", handleError);
|
audioElement.src = "";
|
||||||
|
if (handleCanPlay)
|
||||||
|
audioElement.removeEventListener("canplay", handleCanPlay);
|
||||||
|
if (handleError) audioElement.removeEventListener("error", handleError);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}, [transcriptId, !api, later, api_url]);
|
}, [transcriptId, api, later, api_url]);
|
||||||
|
|
||||||
const getNow = () => {
|
const getNow = () => {
|
||||||
setLater(false);
|
setLater(false);
|
||||||
|
|||||||
@@ -10,16 +10,22 @@ type AudioWaveFormResponse = {
|
|||||||
error: Error | null;
|
error: Error | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
const useWaveform = (id: string, waiting: boolean): AudioWaveFormResponse => {
|
const useWaveform = (id: string, skip: boolean): AudioWaveFormResponse => {
|
||||||
const [waveform, setWaveform] = useState<AudioWaveform | null>(null);
|
const [waveform, setWaveform] = useState<AudioWaveform | null>(null);
|
||||||
const [loading, setLoading] = useState<boolean>(true);
|
const [loading, setLoading] = useState<boolean>(false);
|
||||||
const [error, setErrorState] = useState<Error | null>(null);
|
const [error, setErrorState] = useState<Error | null>(null);
|
||||||
const { setError } = useError();
|
const { setError } = useError();
|
||||||
const api = useApi();
|
const api = useApi();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!id || !api || waiting) return;
|
if (!id || !api || skip) {
|
||||||
|
setLoading(false);
|
||||||
|
setErrorState(null);
|
||||||
|
setWaveform(null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
|
setErrorState(null);
|
||||||
api
|
api
|
||||||
.v1TranscriptGetAudioWaveform({ transcriptId: id })
|
.v1TranscriptGetAudioWaveform({ transcriptId: id })
|
||||||
.then((result) => {
|
.then((result) => {
|
||||||
@@ -29,14 +35,9 @@ const useWaveform = (id: string, waiting: boolean): AudioWaveFormResponse => {
|
|||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
setErrorState(err);
|
setErrorState(err);
|
||||||
const shouldShowHuman = shouldShowError(err);
|
setLoading(false);
|
||||||
if (shouldShowHuman) {
|
|
||||||
setError(err, "There was an error loading the waveform");
|
|
||||||
} else {
|
|
||||||
setError(err);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}, [id, !api, waiting]);
|
}, [id, api, skip]);
|
||||||
|
|
||||||
return { waveform, loading, error };
|
return { waveform, loading, error };
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user