Skip to content

Commit

Permalink
fix: solved pr-comments
Browse files Browse the repository at this point in the history
  • Loading branch information
malmen237 committed Oct 25, 2024
1 parent d619965 commit ff40f90
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
});
Expand All @@ -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 =
Expand All @@ -86,19 +86,19 @@ 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;
});

if (selectedLayout) {
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(() => {
Expand All @@ -110,7 +110,7 @@ export default function MultiviewLayoutSettings({
}, [layoutModalOpen]);

useEffect(() => {
setRefresh(layoutModalOpen);
setRefresh(layoutModalOpen);
}, [layoutModalOpen]);

useEffect(() => {
Expand Down Expand Up @@ -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
);

Expand Down Expand Up @@ -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'));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { IconTrash } from '@tabler/icons-react';
import { hi } from 'date-fns/locale';

type RemoveLayoutButtonProps = {
removeMultiviewLayout: () => void;
Expand Down
4 changes: 2 additions & 2 deletions src/components/startProduction/StartProductionButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -263,7 +263,7 @@ export function StartProductionButton({
onAbort={onAbort}
onConfirm={onConfirm}
open={modalOpen}
loading={loading || updateLading}
loading={loading || updateLoading}
startStatus={startProductionStatus}
/>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -49,9 +49,9 @@ export function useCleanedDefaultPreset({
}
};
});
setCleanedDefaultPresets(cleanedPresets);
setUpdatedMultiviewPresets(updatedPresets);
}
}, [dirtyMultiviewPresets, sourceList, isChecked]);
}, [databaseMultiviewPresets, sourceList, isChecked]);

return { cleanedDefaultPresets };
return { multiviewDefaultPresets: updatedMultiviewPresets };
}
4 changes: 2 additions & 2 deletions src/hooks/useUpdateSourceInputSlotOnMultiviewLayouts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit ff40f90

Please sign in to comment.