fix: removed some unnecessary code and got layout-setup to work (#78)

* fix: removed some unnecessary code and got layout-setup to work * fix: blocked layouts in use from being removed and minor fixes * fix: updated translations-texts * fix: added and updated some texts and added early return on clicking 'no layout'-selection * fix: removed unnecessary toast-error * fix: updated text-response
Eyevinn · Nov 8, 2024 · ef34b29 · ef34b29
1 parent ba606a5
commit ef34b29
Show file tree

Hide file tree

Showing 12 changed files with 192 additions and 139 deletions.
diff --git a/src/components/modal/configureOutputModal/Decision.tsx b/src/components/modal/configureOutputModal/Decision.tsx
@@ -5,9 +5,15 @@ interface IDecision {
   onClose: () => void;
   onSave: () => void;
   className?: string;
+  buttonText?: string;
 }
 
-export default function Decision({ onClose, onSave, className }: IDecision) {
+export default function Decision({
+  onClose,
+  onSave,
+  className,
+  buttonText
+}: IDecision) {
   const t = useTranslate();
 
   return (
@@ -17,7 +23,7 @@ export default function Decision({ onClose, onSave, className }: IDecision) {
       }`}
     >
       <Button className="hover:bg-red-500" onClick={onClose} state="warning">
-        {t('close')}
+        {buttonText ? buttonText : t('close')}
       </Button>
       <Button
         className="relative flex hover:bg-green-400"

diff --git a/src/components/modal/multiviewLayoutSetup/MultiviewLayoutSetup.tsx b/src/components/modal/multiviewLayoutSetup/MultiviewLayoutSetup.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { MultiviewPreset } from '../../../interfaces/preset';
 import { useTranslate } from '../../../i18n/useTranslate';
 import { useSetupMultiviewLayout } from '../../../hooks/useSetupMultiviewLayout';
@@ -20,7 +20,6 @@ import Decision from '../configureOutputModal/Decision';
 import { Modal } from '../Modal';
 import { useMultiviewDefaultPresets } from '../../../hooks/useMultiviewDefaultPresets';
 import Checkbox from './Checkbox';
-import { useMultiviewPresets } from '../../../hooks/multiviewPreset';
 
 type ChangeLayout = {
   defaultLabel?: string;
@@ -34,14 +33,16 @@ export default function MultiviewLayoutSetup({
   isProductionActive,
   sourceList,
   open,
-  onClose
+  onClose,
+  savedMultiviews
 }: {
   onUpdateLayoutPreset: (newLayout: TMultiviewLayout | null) => void;
   productionId: string;
   isProductionActive: boolean;
   sourceList: SourceReference[];
   open: boolean;
   onClose: () => void;
+  savedMultiviews: string[];
 }) {
   const [selectedMultiviewPreset, setSelectedMultiviewPreset] =
     useState<MultiviewPreset | null>(null);
@@ -52,7 +53,6 @@ export default function MultiviewLayoutSetup({
   const [newPresetName, setNewPresetName] = useState<string | null>(null);
   const { inputList } = useCreateInputArray(sourceList);
   const [multiviewLayouts] = useMultiviewLayouts(refresh);
-  const [multiviewPresets] = useMultiviewPresets();
   const { multiviewDefaultPresets } = useMultiviewDefaultPresets({
     sourceList,
     isChecked
@@ -78,17 +78,24 @@ export default function MultiviewLayoutSetup({
     ? multiviewDefaultPresets?.map((preset) => preset.name)
     : [];
 
-  const availableMultiviewLayouts =
-    multiviewLayouts?.filter(
-      (layout) => layout.productionId === productionId
-    ) || [];
+  const availableMultiviewLayouts = useMemo(() => {
+    return (
+      multiviewLayouts?.filter(
+        (layout) => layout.productionId === productionId
+      ) || []
+    );
+  }, [multiviewLayouts, productionId]);
 
   const multiviewLayoutNames =
     availableMultiviewLayouts?.map((layout) => layout.name) || [];
   const layoutNameAlreadyExist = availableMultiviewLayouts?.find(
     (singlePreset) => singlePreset.name === newPresetName
   )?.name;
 
+  useEffect(() => {
+    availableMultiviewLayouts ? setRefresh(false) : setRefresh(true);
+  }, [availableMultiviewLayouts]);
+
   // This useEffect is used to set the drawn layout of the multiviewer on start,
   // if this fails then the modal will be empty
   useEffect(() => {
@@ -107,33 +114,31 @@ export default function MultiviewLayoutSetup({
       setPresetName(multiviewDefaultPresets[0].name);
       setSelectedMultiviewPreset(multiviewDefaultPresets[0]);
     }
-  }, [multiviewDefaultPresets, multiviewLayouts]);
+  }, [
+    multiviewDefaultPresets,
+    multiviewLayouts,
+    selectedMultiviewPreset?.name
+  ]);
 
   // Refresh the layout list when a layout is deleted
   useEffect(() => {
     setRefresh(open);
+    setChangedLayout(null);
   }, [open]);
 
   useEffect(() => {
-    if (multiviewLayouts) {
-      setRefresh(false);
-    }
-  }, [multiviewLayouts]);
-
-  const onSave = () => {
     if (multiviewLayout) {
       setSelectedMultiviewPreset(multiviewLayout);
-      onUpdateLayoutPreset({
-        ...multiviewLayout,
-        name:
-          multiviewLayout.name !== presetName && newPresetName !== ''
-            ? multiviewLayout.name
-            : ''
-      });
-    } else {
-      setSelectedMultiviewPreset(null);
-      onUpdateLayoutPreset(null);
+      setRefresh(false);
+      setChangedLayout(null);
     }
+  }, [multiviewLayout]);
+
+  const resetLayoutSetup = () => {
+    setNewPresetName('');
+    setPresetName('');
+    setIsChecked(false);
+    setSelectedMultiviewPreset(null);
   };
 
   const handleLayoutUpdate = (name: string, type: string) => {
@@ -146,6 +151,7 @@ export default function MultiviewLayoutSetup({
 
     switch (type) {
       case 'layout':
+        if (availableMultiviewLayouts.length === 0) return;
         setNewPresetName(name || '');
         if (chosenLayout) {
           setIsChecked(false);
@@ -164,7 +170,7 @@ export default function MultiviewLayoutSetup({
   };
 
   const handleChange = (viewId: string, value: string) => {
-    if (inputList && availableMultiviewLayouts) {
+    if (inputList) {
       const emptyView = {
         id: '',
         input_slot: 0,
@@ -191,6 +197,21 @@ export default function MultiviewLayoutSetup({
       toast.error(t('preset.could_not_delete_layout'));
       return;
     }
+
+    // Check if the layout is in use
+    if (
+      layoutToRemove &&
+      layoutToRemove._id &&
+      savedMultiviews.includes(
+        typeof layoutToRemove._id === 'string'
+          ? layoutToRemove._id
+          : layoutToRemove._id.toString()
+      )
+    ) {
+      toast.error(t('preset.could_not_delete_layout_in_use'));
+      return;
+    }
+
     if (layoutToRemove && layoutToRemove._id) {
       deleteLayout(layoutToRemove._id.toString()).then(() => {
         setRefresh(true);
@@ -203,14 +224,26 @@ export default function MultiviewLayoutSetup({
     }
   };
 
+  const saveNewLayout = () => {
+    if (selectedMultiviewPreset && newPresetName) {
+      onUpdateLayoutPreset({
+        ...selectedMultiviewPreset,
+        name: newPresetName,
+        productionId: productionId
+      });
+      resetLayoutSetup();
+    }
+  };
+
   const closeLayoutModal = () => {
     setRefresh(true);
+    resetLayoutSetup();
     onClose();
   };
 
   return (
     <Modal open={open}>
-      {selectedMultiviewPreset && (
+      {multiviewPresetLayout && (
         <div className="flex flex-col w-full h-full">
           <div className="flex flex-col self-center w-[50%] pt-5">
             <div className="flex flex-row align-middle items-center">
@@ -221,7 +254,7 @@ export default function MultiviewLayoutSetup({
                     ? multiviewLayoutNames.map((singleItem) => ({
                         label: singleItem
                       }))
-                    : [{ label: 'No layouts available' }]
+                    : [{ label: t('preset.no_avaliable_layouts') }]
                 }
                 value={selectedMultiviewPreset?.name || ''}
                 update={(value) => handleLayoutUpdate(value, 'layout')}
@@ -250,14 +283,11 @@ export default function MultiviewLayoutSetup({
               />
             </div>
           </div>
-
-          {multiviewPresetLayout && (
-            <MultiviewLayout
-              multiviewPresetLayout={multiviewPresetLayout}
-              inputList={inputList}
-              handleChange={handleChange}
-            />
-          )}
+          <MultiviewLayout
+            multiviewPresetLayout={multiviewPresetLayout}
+            inputList={inputList}
+            handleChange={handleChange}
+          />
           <div className="flex flex-col w-[50%] h-full pt-3">
             <Input
               label={t('name')}
@@ -274,7 +304,7 @@ export default function MultiviewLayoutSetup({
           <Decision
             className="mt-6"
             onClose={closeLayoutModal}
-            onSave={onSave}
+            onSave={saveNewLayout}
           />
         </div>
       )}

diff --git a/src/components/modal/multiviewLayoutSetup/MultiviewLayoutSetupButton.tsx b/src/components/modal/multiviewLayoutSetup/MultiviewLayoutSetupButton.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { IconSettings } from '@tabler/icons-react';
 import { TMultiviewLayout } from '../../../interfaces/preset';
 import { useTranslate } from '../../../i18n/useTranslate';
@@ -13,19 +13,29 @@ type MultiviewLayoutSetupButtonProps = {
   productionId: string;
   isProductionActive: boolean;
   sourceList: SourceReference[];
+  refreshLayoutList: (reload: boolean) => void;
+  savedMultiviews: string[];
 };
 
 export function MultiviewLayoutSetupButton({
   onUpdateLayoutPreset,
   productionId,
   isProductionActive,
-  sourceList
+  sourceList,
+  refreshLayoutList,
+  savedMultiviews
 }: MultiviewLayoutSetupButtonProps) {
   const [modalOpen, setModalOpen] = useState(false);
+  const t = useTranslate();
+
   const toggleConfigModal = () => {
     setModalOpen((state) => !state);
   };
-  const t = useTranslate();
+
+  useEffect(() => {
+    refreshLayoutList(!modalOpen);
+  }, [modalOpen, refreshLayoutList]);
+
   return (
     <>
       <Button
@@ -40,12 +50,13 @@ export function MultiviewLayoutSetupButton({
         productionId={productionId}
         isProductionActive={isProductionActive}
         sourceList={sourceList}
-        onUpdateLayoutPreset={() => {
+        onUpdateLayoutPreset={(newLayout: TMultiviewLayout | null) => {
           setModalOpen(false);
-          onUpdateLayoutPreset;
+          onUpdateLayoutPreset(newLayout);
         }}
         open={modalOpen}
         onClose={() => setModalOpen(false)}
+        savedMultiviews={savedMultiviews}
       />
     </>
   );

diff --git a/src/components/modal/multiviewLayoutSetup/MultiviewSettings.tsx b/src/components/modal/multiviewLayoutSetup/MultiviewSettings.tsx
@@ -40,53 +40,51 @@ export default function MultiviewSettingsConfig({
     return multiviewLayouts?.filter(
       (layout) => layout.productionId === productionId || !layout.productionId
     );
-  }, [multiviewLayouts]);
+  }, [multiviewLayouts, productionId]);
+
+  const defaultMultiview = multiviewLayouts
+    ? multiviewLayouts.find((m) => m.productionId !== undefined)
+    : undefined;
 
   const multiviewLayoutNames = useMemo(() => {
     return avaliableMultiviewLayouts?.map((layout) => layout.name) || [];
-  }, [multiviewLayouts]);
+  }, [avaliableMultiviewLayouts]);
 
   useEffect(() => {
     if (
       refresh &&
       multiview &&
-      multiviewLayouts &&
-      multiviewLayouts.length > 0
+      avaliableMultiviewLayouts &&
+      avaliableMultiviewLayouts.length > 0
     ) {
       handleSetSelectedMultiviewLayout(multiview.name);
     }
-  }, [refresh, multiviewLayouts]);
+  }, [refresh, avaliableMultiviewLayouts]);
 
   useEffect(() => {
     if (multiview) {
       setSelectedMultiviewLayout(multiview);
       return;
     }
-    if (multiviewLayouts) {
-      const defaultMultiview = multiviewLayouts.find(
-        (m) => m.productionId !== undefined
-      );
-      if (defaultMultiview) {
-        setSelectedMultiviewLayout(defaultMultiview);
-      }
+    if (defaultMultiview) {
+      setSelectedMultiviewLayout(defaultMultiview);
     }
-  }, [lastItem, multiview, multiviewLayouts, newMultiviewLayout]);
+  }, [lastItem, multiview, newMultiviewLayout, defaultMultiview]);
 
   if (!multiview) {
-    if (!multiviewLayouts || multiviewLayouts.length === 0) {
+    if (!defaultMultiview) {
       return null;
     }
     handleUpdateMultiview({
-      ...multiviewLayouts[0],
-      _id: multiviewLayouts[0]._id?.toString(),
+      ...defaultMultiview,
+      _id: defaultMultiview._id?.toString(),
       for_pipeline_idx: 0
     });
   }
 
   const handleSetSelectedMultiviewLayout = (name: string) => {
     const selected = multiviewLayouts?.find((m) => m.name === name);
     if (!selected) {
-      toast.error(t('preset.no_multiview_found'));
       return;
     }
     const updatedMultiview = {