From 4c4d1f35e6f70a9c02c33e77a3426c8c553bc308 Mon Sep 17 00:00:00 2001 From: Saelmala Date: Thu, 7 Nov 2024 14:33:34 +0100 Subject: [PATCH 1/2] fix: bug sourceId not setting correctly --- .../[ingest_name]/[ingest_source_name]/route.ts | 5 +++-- .../modal/ConfigureAlignmentLatencyModal.tsx | 16 ++++++++++++++-- src/components/sourceCard/SourceCard.tsx | 5 ++++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/app/api/manager/ingests/source_id/[ingest_name]/[ingest_source_name]/route.ts b/src/app/api/manager/ingests/source_id/[ingest_name]/[ingest_source_name]/route.ts index d5b1d752..eb732532 100644 --- a/src/app/api/manager/ingests/source_id/[ingest_name]/[ingest_source_name]/route.ts +++ b/src/app/api/manager/ingests/source_id/[ingest_name]/[ingest_source_name]/route.ts @@ -21,9 +21,10 @@ export async function GET( } try { - const ingestUuid = await getUuidFromIngestName(params.ingest_name); + const ingestUuid = await getUuidFromIngestName(params.ingest_name, false); + const sourceId = ingestUuid - ? await getSourceIdFromSourceName(ingestUuid, params.ingest_source_name) + ? await getSourceIdFromSourceName(ingestUuid, params.ingest_source_name, false) : 0; return new NextResponse(JSON.stringify(sourceId), { status: 200 }); } catch (error) { diff --git a/src/components/modal/ConfigureAlignmentLatencyModal.tsx b/src/components/modal/ConfigureAlignmentLatencyModal.tsx index 710599e3..550144ab 100644 --- a/src/components/modal/ConfigureAlignmentLatencyModal.tsx +++ b/src/components/modal/ConfigureAlignmentLatencyModal.tsx @@ -4,7 +4,7 @@ import { Button } from '../button/Button'; import { Loader } from '../loader/Loader'; import { ISource } from '../../hooks/useDragableItems'; import { useState, useEffect, useRef } from 'react'; -import { useIngestStreams } from '../../hooks/ingests'; +import { useIngestStreams, useIngestSourceId } from '../../hooks/ingests'; import { useGetProductionSourceAlignmentAndLatency } from '../../hooks/productions'; import { ResourcesCompactPipelineResponse, @@ -73,6 +73,7 @@ export function ConfigureAlignmentLatencyModal({ const [showRestartStreamModal, setShowRestartStreamModal] = useState(false); const [inputErrors, setInputErrors] = useState>({}); + const [getIngestSourceId] = useIngestSourceId(); const t = useTranslate(); const getIngestStreams = useIngestStreams(); @@ -99,6 +100,18 @@ export function ConfigureAlignmentLatencyModal({ } }, [pipelinesAreSelected, latencies, alignments]); + useEffect(() => { + const fetchSourceId = async () => { + const sourceId = await getIngestSourceId( + source.ingest_name, + source.ingest_source_name + ); + setSourceId(sourceId); + }; + + fetchSourceId(); + }, [source]); + useEffect(() => { const fetchStreams = async () => { try { @@ -132,7 +145,6 @@ export function ConfigureAlignmentLatencyModal({ newAlignments[stream.pipeline_uuid] = 0; newLatencies[stream.pipeline_uuid] = 0; } - setSourceId(stream.source_id); } } else if (availablePipelines) { for (const pipeline of availablePipelines) { diff --git a/src/components/sourceCard/SourceCard.tsx b/src/components/sourceCard/SourceCard.tsx index c510bce3..7e57ea27 100644 --- a/src/components/sourceCard/SourceCard.tsx +++ b/src/components/sourceCard/SourceCard.tsx @@ -57,7 +57,10 @@ export default function SourceCard({ const { locked } = useContext(GlobalContext); const pipelinesAreSelected = - pipelines.some((pipeline) => pipeline.pipeline_id === undefined) === false; + pipelines.some( + (pipeline) => + pipeline.pipeline_id === undefined || pipeline.pipeline_id === '' + ) === false; const updateText = (event: ChangeEvent) => { setSourceLabel(event.currentTarget.value); From d100a3146723f03c52aa4b07d0f479f680d86be9 Mon Sep 17 00:00:00 2001 From: Saelmala Date: Thu, 7 Nov 2024 14:39:05 +0100 Subject: [PATCH 2/2] fix: prettier test fail --- .../source_id/[ingest_name]/[ingest_source_name]/route.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/api/manager/ingests/source_id/[ingest_name]/[ingest_source_name]/route.ts b/src/app/api/manager/ingests/source_id/[ingest_name]/[ingest_source_name]/route.ts index eb732532..8b923e27 100644 --- a/src/app/api/manager/ingests/source_id/[ingest_name]/[ingest_source_name]/route.ts +++ b/src/app/api/manager/ingests/source_id/[ingest_name]/[ingest_source_name]/route.ts @@ -24,7 +24,11 @@ export async function GET( const ingestUuid = await getUuidFromIngestName(params.ingest_name, false); const sourceId = ingestUuid - ? await getSourceIdFromSourceName(ingestUuid, params.ingest_source_name, false) + ? await getSourceIdFromSourceName( + ingestUuid, + params.ingest_source_name, + false + ) : 0; return new NextResponse(JSON.stringify(sourceId), { status: 200 }); } catch (error) {