From de052247bb660c96528a5511e6d188b3469cbd31 Mon Sep 17 00:00:00 2001 From: Gregor Billing Date: Mon, 1 Jan 2024 21:10:15 +0100 Subject: [PATCH] Run Prettier linter --- .../main/components/FmcTranslationsDetail.tsx | 25 ++++--- tnoodle-ui/src/main/components/MbldDetail.tsx | 66 +++++++++++-------- tnoodle-ui/src/main/components/SideBar.tsx | 8 ++- tnoodle-ui/src/main/redux/Store.ts | 2 +- 4 files changed, 61 insertions(+), 40 deletions(-) diff --git a/tnoodle-ui/src/main/components/FmcTranslationsDetail.tsx b/tnoodle-ui/src/main/components/FmcTranslationsDetail.tsx index 209bec3a4..819037485 100644 --- a/tnoodle-ui/src/main/components/FmcTranslationsDetail.tsx +++ b/tnoodle-ui/src/main/components/FmcTranslationsDetail.tsx @@ -1,5 +1,5 @@ import { chunk } from "lodash"; -import React, {useCallback, useEffect, useState} from "react"; +import React, { useCallback, useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import RootState from "../model/RootState"; import { setFileZip } from "../redux/slice/ScramblingSlice"; @@ -71,9 +71,7 @@ const FmcTranslationsDetail = ({ }; const updateEventSelectedTranslations = useCallback( - ( - selectedTranslations: string[] - ) => { + (selectedTranslations: string[]) => { setExtensionLazily( fmcWcifEvent, fmcTranslationsExtensionId, @@ -83,16 +81,27 @@ const FmcTranslationsDetail = ({ dispatch(setFileZip()); } ); - }, [dispatch, fmcWcifEvent] + }, + [dispatch, fmcWcifEvent] ); useEffect(() => { - const existingExtensionFmc = findExtension(fmcWcifEvent, fmcTranslationsExtensionId); + const existingExtensionFmc = findExtension( + fmcWcifEvent, + fmcTranslationsExtensionId + ); - if (existingExtensionFmc === undefined && suggestedFmcTranslations !== undefined) { + if ( + existingExtensionFmc === undefined && + suggestedFmcTranslations !== undefined + ) { updateEventSelectedTranslations(suggestedFmcTranslations); } - }, [fmcWcifEvent, updateEventSelectedTranslations, suggestedFmcTranslations]); + }, [ + fmcWcifEvent, + updateEventSelectedTranslations, + suggestedFmcTranslations, + ]); const handleTranslation = (id: string, status: boolean) => { let newSelectedTranslations = selectedTranslations.filter( diff --git a/tnoodle-ui/src/main/components/MbldDetail.tsx b/tnoodle-ui/src/main/components/MbldDetail.tsx index 11ebba586..a1816fbf6 100644 --- a/tnoodle-ui/src/main/components/MbldDetail.tsx +++ b/tnoodle-ui/src/main/components/MbldDetail.tsx @@ -5,15 +5,12 @@ import { setWcifEvent } from "../redux/slice/WcifSlice"; import { setFileZip } from "../redux/slice/ScramblingSlice"; import WcifEvent from "../model/WcifEvent"; import { mbldCubesExtensionId } from "../util/wcif.util"; -import { - useCallback, - useEffect, - useState -} from "react"; +import { useCallback, useEffect, useState } from "react"; import { findAndProcessExtension, findExtension, - setExtensionLazily, upsertExtension, + setExtensionLazily, + upsertExtension, } from "../util/extension.util"; interface MbldDetailProps { @@ -31,10 +28,8 @@ const MbldDetail = ({ mbldWcifEvent }: MbldDetailProps) => { const [mbld, setMbld] = useState(MBLD_DEFAULT); useEffect(() => { - findAndProcessExtension( - mbldWcifEvent, - mbldCubesExtensionId, - (ext) => setMbld(ext.data.requestedScrambles) + findAndProcessExtension(mbldWcifEvent, mbldCubesExtensionId, (ext) => + setMbld(ext.data.requestedScrambles) ); }, [mbldWcifEvent]); @@ -48,26 +43,39 @@ const MbldDetail = ({ mbldWcifEvent }: MbldDetailProps) => { }; }; - const updateEventMbld = useCallback((mbld: number) => { - setExtensionLazily( - mbldWcifEvent, - mbldCubesExtensionId, - () => buildMbldExtension(mbld), - (newWcifEvent) => { - newWcifEvent.rounds = newWcifEvent.rounds.map((wcifRound) => { - const overrideExtension = buildMbldExtension(mbld); - return upsertExtension(wcifRound, overrideExtension); - }); + const updateEventMbld = useCallback( + (mbld: number) => { + setExtensionLazily( + mbldWcifEvent, + mbldCubesExtensionId, + () => buildMbldExtension(mbld), + (newWcifEvent) => { + newWcifEvent.rounds = newWcifEvent.rounds.map( + (wcifRound) => { + const overrideExtension = buildMbldExtension(mbld); + return upsertExtension( + wcifRound, + overrideExtension + ); + } + ); - dispatch(setWcifEvent(newWcifEvent)); - dispatch(setFileZip()); - } - ); - }, [dispatch, mbldWcifEvent]); + dispatch(setWcifEvent(newWcifEvent)); + dispatch(setFileZip()); + } + ); + }, + [dispatch, mbldWcifEvent] + ); useEffect(() => { - const existingExtensionMbld = findExtension(mbldWcifEvent, mbldCubesExtensionId); - const shouldOverride = existingExtensionMbld === undefined || existingExtensionMbld.data.requestedScrambles !== bestMbldAttempt; + const existingExtensionMbld = findExtension( + mbldWcifEvent, + mbldCubesExtensionId + ); + const shouldOverride = + existingExtensionMbld === undefined || + existingExtensionMbld.data.requestedScrambles !== bestMbldAttempt; if (shouldOverride && bestMbldAttempt !== undefined) { updateEventMbld(bestMbldAttempt); @@ -85,7 +93,9 @@ const MbldDetail = ({ mbldWcifEvent }: MbldDetailProps) => { className="form-control bg-dark text-white" type="number" value={mbld} - onChange={(e) => updateEventMbld(Number(e.target.value))} + onChange={(e) => + updateEventMbld(Number(e.target.value)) + } min={MBLD_MIN} required disabled={generatingScrambles} diff --git a/tnoodle-ui/src/main/components/SideBar.tsx b/tnoodle-ui/src/main/components/SideBar.tsx index 8bfeeb868..261f005f4 100644 --- a/tnoodle-ui/src/main/components/SideBar.tsx +++ b/tnoodle-ui/src/main/components/SideBar.tsx @@ -30,7 +30,7 @@ import { defaultWcif } from "../util/wcif.util"; import Loading from "./Loading"; import "./SideBar.css"; import Wcif from "../model/Wcif"; -import {setShowColorPicker} from "../redux/slice/SettingsSlice"; +import { setShowColorPicker } from "../redux/slice/SettingsSlice"; const SideBar = () => { const [loadingUser, setLoadingUser] = useState(false); @@ -282,9 +282,11 @@ const SideBar = () => { checked={showColorPicker} onChange={(e) => dispatch(setShowColorPicker(e.target.checked))} /> - + - ) + ); return (
diff --git a/tnoodle-ui/src/main/redux/Store.ts b/tnoodle-ui/src/main/redux/Store.ts index 12fb921dc..9b5d4f03d 100644 --- a/tnoodle-ui/src/main/redux/Store.ts +++ b/tnoodle-ui/src/main/redux/Store.ts @@ -4,7 +4,7 @@ import { informationSlice } from "./slice/InformationSlice"; import { scramblingSlice } from "./slice/ScramblingSlice"; import { wcifSlice } from "./slice/WcifSlice"; import { eventDataSlice } from "./slice/EventDataSlice"; -import {settingsSlice} from "./slice/SettingsSlice"; +import { settingsSlice } from "./slice/SettingsSlice"; const store = configureStore({ reducer: {