Skip to content

Commit

Permalink
fix: lint-errors, ts-errors and made delete not possible on running prod
Browse files Browse the repository at this point in the history
  • Loading branch information
malmen237 committed Oct 16, 2024
1 parent 86eed4b commit 182d197
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ export default function MultiviewLayoutSettings({
}) {
const [selectedMultiviewPreset, setSelectedMultiviewPreset] =
useState<MultiviewPreset | null>(null);
const [refresh, setRefresh] =
useState(true);
const [refresh, setRefresh] = useState(true);
const [changedLayout, setChangedLayout] = useState<ChangeLayout | null>(null);
const [newPresetName, setNewPresetName] = useState<string | null>(null);
const [layoutToChange, setLayoutToChange] = useState<string>('');
Expand Down Expand Up @@ -71,8 +70,8 @@ export default function MultiviewLayoutSettings({
(layout) => layout.productionId === production?._id
) || [];
const globalMultiviewLayouts = multiviewLayouts?.filter(
(layout) => !layout.productionId
);
(layout) => !layout.productionId
);
const deleteDisabled = productionLayouts.length < 1;

// This useEffect is used to set the drawn layout of the multiviewer on start,
Expand Down Expand Up @@ -191,21 +190,23 @@ export default function MultiviewLayoutSettings({
}
update={(value) => handleLayoutUpdate(value, 'layout')}
/>
<button
type="button"
title={t('preset.remove_layout')}
className="absolute top-0 right-[-10%] min-w-fit"
onClick={() => removeMultiviewLayout()}
disabled={deleteDisabled}
>
<IconTrash
className={`ml-4 ${
deleteDisabled
? 'pointer-events-none text-zinc-400'
: 'text-button-delete hover:text-red-400'
}`}
/>
</button>
{!production?.isActive && (
<button
type="button"
title={t('preset.remove_layout')}
className="absolute top-0 right-[-10%] min-w-fit"
onClick={() => removeMultiviewLayout()}
disabled={deleteDisabled}
>
<IconTrash
className={`ml-4 ${
deleteDisabled
? 'pointer-events-none text-zinc-400'
: 'text-button-delete hover:text-red-400'
}`}
/>
</button>
)}
</div>
<Options
label={t('preset.select_multiview_preset')}
Expand Down
2 changes: 1 addition & 1 deletion src/components/startProduction/StartProductionButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function StartProductionButton({
const [deleteMonitoring] = useDeleteMonitoring();
const [modalOpen, setModalOpen] = useState(false);
const [stopModalOpen, setStopModalOpen] = useState(false);
const [multiviewLayouts] = useMultiviewLayouts();
const [multiviewLayouts] = useMultiviewLayouts(true);

const onClick = () => {
if (!production) return;
Expand Down
6 changes: 4 additions & 2 deletions src/hooks/multiviewLayout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ export function useGetMultiviewLayout() {
};
}

export function useMultiviewLayouts(refresh: boolean): DataHook<TMultiviewLayout[]> {
export function useMultiviewLayouts(
refresh: boolean
): DataHook<TMultiviewLayout[]> {
const [loading, setLoading] = useState(true);
const [multiviewLayouts, setmultiviewLayouts] = useState<TMultiviewLayout[]>(
[]
Expand All @@ -39,7 +41,7 @@ export function useMultiviewLayouts(refresh: boolean): DataHook<TMultiviewLayout
useEffect(() => {
setmultiviewLayouts([]);

if(!refresh) {
if (!refresh) {
return;
}

Expand Down
3 changes: 2 additions & 1 deletion src/i18n/locales/sv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,8 @@ export const sv = {
remove_layout: 'Ta bort komposition',
add_another_multiview: 'Lägg till ny multiview',
layout_deleted: 'Kompositionen har tagits bort',
not_possible_delete_global_layout: 'Det går inte att ta bort globala kompositioner',
not_possible_delete_global_layout:
'Det går inte att ta bort globala kompositioner',
could_not_delete_layout: 'Kunde inte ta bort kompositionen'
},
error: {
Expand Down

0 comments on commit 182d197

Please sign in to comment.