From ff40f90b92e2eb06ba9d3ebd2d2404fc4f25348d Mon Sep 17 00:00:00 2001 From: malmen237 Date: Fri, 25 Oct 2024 13:43:25 +0200 Subject: [PATCH] fix: solved pr-comments --- .../MultiviewLayoutSettings.tsx | 26 +++++++++---------- .../RemoveLayoutButton.tsx | 1 - .../startProduction/StartProductionButton.tsx | 4 +-- ...set.tsx => useMultiviewDefaultPresets.tsx} | 16 ++++++------ ...pdateSourceInputSlotOnMultiviewLayouts.tsx | 4 +-- 5 files changed, 25 insertions(+), 26 deletions(-) rename src/hooks/{useCleanedDefaultPreset.tsx => useMultiviewDefaultPresets.tsx} (74%) diff --git a/src/components/modal/configureMultiviewModal/MultiviewLayoutSettings/MultiviewLayoutSettings.tsx b/src/components/modal/configureMultiviewModal/MultiviewLayoutSettings/MultiviewLayoutSettings.tsx index 78d0468d..4e7014f5 100644 --- a/src/components/modal/configureMultiviewModal/MultiviewLayoutSettings/MultiviewLayoutSettings.tsx +++ b/src/components/modal/configureMultiviewModal/MultiviewLayoutSettings/MultiviewLayoutSettings.tsx @@ -16,7 +16,7 @@ import Input from '../../configureOutputModal/Input'; import MultiviewLayout from './MultiviewLayout'; import toast from 'react-hot-toast'; import RemoveLayoutButton from './RemoveLayoutButton'; -import { useCleanedDefaultPreset } from '../../../../hooks/useCleanedDefaultPreset'; +import { useMultiviewDefaultPresets } from '../../../../hooks/useMultiviewDefaultPresets'; import Checkbox from './Checkbox'; type ChangeLayout = { @@ -44,7 +44,7 @@ export default function MultiviewLayoutSettings({ const { inputList } = useCreateInputArray(production); const [multiviewLayouts] = useMultiviewLayouts(refresh); const sourceList = production ? production.sources : []; - const { cleanedDefaultPresets } = useCleanedDefaultPreset({ + const { multiviewDefaultPresets } = useMultiviewDefaultPresets({ sourceList, isChecked }); @@ -63,10 +63,10 @@ export default function MultiviewLayoutSettings({ const deleteLayout = useDeleteMultiviewLayout(); const t = useTranslate(); - const multiviewPresetNames = cleanedDefaultPresets?.map( + const multiviewPresetNames = multiviewDefaultPresets?.map( (preset) => preset.name ) - ? cleanedDefaultPresets?.map((preset) => preset.name) + ? multiviewDefaultPresets?.map((preset) => preset.name) : []; const availableMultiviewLayouts = @@ -86,7 +86,7 @@ export default function MultiviewLayoutSettings({ const selectedLayout = multiviewLayouts?.find((layout) => { return layout.name === selectedMultiviewPreset?.name; }); - const loadedPreset = cleanedDefaultPresets?.find((preset) => { + const loadedPreset = multiviewDefaultPresets?.find((preset) => { return preset.name === selectedMultiviewPreset?.name; }); @@ -94,11 +94,11 @@ export default function MultiviewLayoutSettings({ setSelectedMultiviewPreset(selectedLayout); } else if (loadedPreset && !selectedLayout) { setSelectedMultiviewPreset(loadedPreset); - } else if (cleanedDefaultPresets && cleanedDefaultPresets[0]) { - setPresetName(cleanedDefaultPresets[0].name); - setSelectedMultiviewPreset(cleanedDefaultPresets[0]); + } else if (multiviewDefaultPresets && multiviewDefaultPresets[0]) { + setPresetName(multiviewDefaultPresets[0].name); + setSelectedMultiviewPreset(multiviewDefaultPresets[0]); } - }, [cleanedDefaultPresets, multiviewLayouts]); + }, [multiviewDefaultPresets, multiviewLayouts]); // Refresh the layout list when a layout is deleted useEffect(() => { @@ -110,7 +110,7 @@ export default function MultiviewLayoutSettings({ }, [layoutModalOpen]); useEffect(() => { - setRefresh(layoutModalOpen); + setRefresh(layoutModalOpen); }, [layoutModalOpen]); useEffect(() => { @@ -139,7 +139,7 @@ export default function MultiviewLayoutSettings({ const chosenLayout = availableMultiviewLayouts?.find( (singleLayout) => singleLayout.name === name ); - const addBasePreset = cleanedDefaultPresets?.find( + const addBasePreset = multiviewDefaultPresets?.find( (singlePreset) => singlePreset.name === name ); @@ -193,8 +193,8 @@ export default function MultiviewLayoutSettings({ if (layoutToRemove && layoutToRemove._id) { deleteLayout(layoutToRemove._id.toString()).then(() => { setRefresh(true); - if (cleanedDefaultPresets && cleanedDefaultPresets[0]) { - setSelectedMultiviewPreset(cleanedDefaultPresets[0]); + if (multiviewDefaultPresets?.[0]) { + setSelectedMultiviewPreset(multiviewDefaultPresets[0]); } setNewPresetName(''); toast.success(t('preset.layout_deleted')); diff --git a/src/components/modal/configureMultiviewModal/MultiviewLayoutSettings/RemoveLayoutButton.tsx b/src/components/modal/configureMultiviewModal/MultiviewLayoutSettings/RemoveLayoutButton.tsx index 8d0420e2..d059782f 100644 --- a/src/components/modal/configureMultiviewModal/MultiviewLayoutSettings/RemoveLayoutButton.tsx +++ b/src/components/modal/configureMultiviewModal/MultiviewLayoutSettings/RemoveLayoutButton.tsx @@ -1,5 +1,4 @@ import { IconTrash } from '@tabler/icons-react'; -import { hi } from 'date-fns/locale'; type RemoveLayoutButtonProps = { removeMultiviewLayout: () => void; diff --git a/src/components/startProduction/StartProductionButton.tsx b/src/components/startProduction/StartProductionButton.tsx index a1ecdc80..ced6a2e4 100644 --- a/src/components/startProduction/StartProductionButton.tsx +++ b/src/components/startProduction/StartProductionButton.tsx @@ -40,7 +40,7 @@ export function StartProductionButton({ const putProduction = usePutProduction(); const [stopProduction, loadingStopProduction] = useStopProduction(); const [deleteMonitoring] = useDeleteMonitoring(); - const [updateSourceInputSlotOnMultiviewLayouts, updateLading] = + const [updateSourceInputSlotOnMultiviewLayouts, updateLoading] = useUpdateSourceInputSlotOnMultiviewLayouts(); const [modalOpen, setModalOpen] = useState(false); const [stopModalOpen, setStopModalOpen] = useState(false); @@ -263,7 +263,7 @@ export function StartProductionButton({ onAbort={onAbort} onConfirm={onConfirm} open={modalOpen} - loading={loading || updateLading} + loading={loading || updateLoading} startStatus={startProductionStatus} /> diff --git a/src/hooks/useCleanedDefaultPreset.tsx b/src/hooks/useMultiviewDefaultPresets.tsx similarity index 74% rename from src/hooks/useCleanedDefaultPreset.tsx rename to src/hooks/useMultiviewDefaultPresets.tsx index 9de9c5d2..7bb43c20 100644 --- a/src/hooks/useCleanedDefaultPreset.tsx +++ b/src/hooks/useMultiviewDefaultPresets.tsx @@ -3,23 +3,23 @@ import { useMultiviewPresets } from './multiviewPreset'; import { MultiviewPreset } from '../interfaces/preset'; import { SourceReference } from '../interfaces/Source'; -export function useCleanedDefaultPreset({ +export function useMultiviewDefaultPresets({ sourceList, isChecked }: { sourceList: SourceReference[] | undefined; isChecked: boolean; }) { - const [cleanedDefaultPresets, setCleanedDefaultPresets] = useState< + const [updatedMultiviewPresets, setUpdatedMultiviewPresets] = useState< MultiviewPreset[] >([]); - const [dirtyMultiviewPresets] = useMultiviewPresets(); + const [databaseMultiviewPresets] = useMultiviewPresets(); useEffect(() => { - if (dirtyMultiviewPresets) { + if (databaseMultiviewPresets) { const sourceListLength = sourceList ? sourceList.length : 0; - const cleanedPresets = dirtyMultiviewPresets.map((preset) => { + const updatedPresets = databaseMultiviewPresets.map((preset) => { return { ...preset, layout: { @@ -49,9 +49,9 @@ export function useCleanedDefaultPreset({ } }; }); - setCleanedDefaultPresets(cleanedPresets); + setUpdatedMultiviewPresets(updatedPresets); } - }, [dirtyMultiviewPresets, sourceList, isChecked]); + }, [databaseMultiviewPresets, sourceList, isChecked]); - return { cleanedDefaultPresets }; + return { multiviewDefaultPresets: updatedMultiviewPresets }; } diff --git a/src/hooks/useUpdateSourceInputSlotOnMultiviewLayouts.tsx b/src/hooks/useUpdateSourceInputSlotOnMultiviewLayouts.tsx index 0f308c46..a0135055 100644 --- a/src/hooks/useUpdateSourceInputSlotOnMultiviewLayouts.tsx +++ b/src/hooks/useUpdateSourceInputSlotOnMultiviewLayouts.tsx @@ -20,7 +20,7 @@ export function useUpdateSourceInputSlotOnMultiviewLayouts(): CallbackHook< setLoading(true); const layouts = await multiviewLayouts(); if (layouts) { - const asd = layouts.map(async (singleLayout) => { + const updatedLayouts = layouts.map(async (singleLayout) => { if (production._id === singleLayout.productionId) { const updated = singleLayout.layout.views.map( (view: MultiviewViews, index) => { @@ -88,7 +88,7 @@ export function useUpdateSourceInputSlotOnMultiviewLayouts(): CallbackHook< } }); const pipelines = production?.production_settings.pipelines; - const multiviewsArr = await Promise.all(asd); + const multiviewsArr = await Promise.all(updatedLayouts); const updatedMultiviews = pipelines[0].multiviews?.map((oldItem) => { const updatedItem = multiviewsArr.find(