fix: removed configurationType from global state

PepperLola · PepperLola · commit d24e87822a5c · 2025-08-04T14:41:53.000-07:00
instead pass as prop just like configType and selectedAssembly - not
sure why it wasn't that way before. fixes field configuration issue
diff --git a/fission/src/systems/input/InputSchemeManager.ts b/fission/src/systems/input/InputSchemeManager.ts
@@ -126,7 +126,7 @@ class InputSchemeManager {
             const conflictingSchemes = scheme.inputs.flatMap(input =>
                 input.keysUsed.flatMap(key => usedKeyMap.get(key) ?? [])
             )
-            console.log(conflictingSchemes)
+            // console.log(conflictingSchemes)
             if (conflictingSchemes.length > 0) {
                 result[scheme.schemeName] ??= {
                     scheme,
diff --git a/fission/src/systems/scene/SceneRenderer.ts b/fission/src/systems/scene/SceneRenderer.ts
@@ -21,6 +21,7 @@ import GizmoSceneObject from "./GizmoSceneObject"
 import SceneObject from "./SceneObject"
 import ScreenInteractionHandler, { InteractionEnd } from "./ScreenInteractionHandler"
 import ImportMirabufPanel from "@/ui/panels/mirabuf/ImportMirabufPanel"
+import { ConfigurationType } from "@/ui/panels/configuring/assembly-config/ConfigTypes"
 
 const CLEAR_COLOR = 0x121212
 const GROUND_COLOR = 0xfffef0
@@ -538,7 +539,7 @@ class SceneRenderer extends WorldSystem {
             miraSupplierData.items.push({
                 name: "Add",
                 func: () => {
-                    globalOpenPanel(ImportMirabufPanel, undefined)
+                    globalOpenPanel(ImportMirabufPanel, { configurationType: "ROBOTS" as ConfigurationType })
                 },
             })
         }
diff --git a/fission/src/ui/StateProvider.tsx b/fission/src/ui/StateProvider.tsx
@@ -2,12 +2,10 @@ import type React from "react"
 import { useMemo, useState } from "react"
 import type { InputScheme } from "@/systems/input/InputTypes"
 import { StateContext, type StateProviderProps } from "./helpers/StateProviderHelpers"
-import type { ConfigurationType } from "./panels/configuring/assembly-config/ConfigTypes"
 
 export const StateProvider: React.FC<StateProviderProps> = ({ children }) => {
     const [unconfirmedImport, setUnconfirmedImport] = useState<boolean>(false)
     const [selectedScheme, setSelectedScheme] = useState<InputScheme | undefined>(undefined)
-    const [configurationType, setConfigurationType] = useState<ConfigurationType>("ROBOTS")
     const [isMainMenuOpen, setIsMainMenuOpen] = useState<boolean>(true)
 
     const stateContextValue = useMemo(
@@ -16,12 +14,10 @@ export const StateProvider: React.FC<StateProviderProps> = ({ children }) => {
             setUnconfirmedImport,
             selectedScheme,
             setSelectedScheme,
-            configurationType,
-            setConfigurationType,
             isMainMenuOpen,
             setIsMainMenuOpen,
         }),
-        [unconfirmedImport, selectedScheme, configurationType, isMainMenuOpen]
+        [unconfirmedImport, selectedScheme, isMainMenuOpen]
     )
 
     return <StateContext.Provider value={stateContextValue}>{children}</StateContext.Provider>
diff --git a/fission/src/ui/components/DragModeIndicator.tsx b/fission/src/ui/components/DragModeIndicator.tsx
@@ -9,7 +9,6 @@ const DragModeIndicator: React.FC = () => {
 
     useEffect(() => {
         const handleDragModeToggle = (event: CustomEvent) => {
-            console.log("toggled")
             setEnabled(event.detail.enabled)
         }
 
diff --git a/fission/src/ui/components/MainHUD.tsx b/fission/src/ui/components/MainHUD.tsx
@@ -22,6 +22,7 @@ import DeveloperToolPanel from "../panels/DeveloperToolPanel"
 import MatchModeConfigPanel from "../panels/configuring/MatchModeConfigPanel"
 import MatchMode, { MatchStateChangeEvent } from "@/systems/match_mode/MatchMode"
 import { useThemeContext } from "../helpers/ThemeProviderHelpers"
+import { ConfigurationType } from "../panels/configuring/assembly-config/ConfigTypes"
 
 type ButtonProps = {
     value: string
@@ -205,7 +206,7 @@ const MainHUD: React.FC = () => {
                     value={"Spawn Asset"}
                     icon={SynthesisIcons.ADD}
                     larger={true}
-                    onClick={() => openPanel(ImportMirabufPanel, undefined)}
+                    onClick={() => openPanel(ImportMirabufPanel, { configurationType: "ROBOTS" as ConfigurationType })}
                 />
                 <Stack direction="column" sx={{ borderRadius: "7px", padding: "4px" }} bgcolor="primary.main" gap={0.5}>
                     <MainHUDButton
diff --git a/fission/src/ui/helpers/StateProviderHelpers.ts b/fission/src/ui/helpers/StateProviderHelpers.ts
@@ -1,6 +1,5 @@
 import { createContext, type ReactNode, useContext } from "react"
 import type { InputScheme } from "@/systems/input/InputTypes"
-import type { ConfigurationType } from "../panels/configuring/assembly-config/ConfigTypes"
 
 export interface StateProviderProps {
     children: ReactNode
@@ -13,9 +12,6 @@ export interface AppState {
     // ConfigureInputs stuff
     selectedScheme?: InputScheme
     setSelectedScheme: (_scheme: InputScheme) => void
-    // Configure Panel
-    configurationType: ConfigurationType
-    setConfigurationType: (_type: ConfigurationType) => void
     // View Cube
     isMainMenuOpen: boolean
     setIsMainMenuOpen: (_state: boolean) => void
@@ -26,8 +22,6 @@ export const StateContext = createContext<AppState>({
     setUnconfirmedImport: () => {},
     selectedScheme: undefined,
     setSelectedScheme: () => {},
-    configurationType: "ROBOTS",
-    setConfigurationType: () => {},
     isMainMenuOpen: true,
     setIsMainMenuOpen: () => {},
 })
diff --git a/fission/src/ui/modals/configuring/inputs/NewInputSchemeModal.tsx b/fission/src/ui/modals/configuring/inputs/NewInputSchemeModal.tsx
@@ -12,7 +12,7 @@ import { Stack } from "@mui/system"
 
 const NewInputSchemeModal: React.FC<ModalImplProps<void, void>> = ({ modal }) => {
     const { openPanel, configureScreen } = useUIContext()
-    const { setSelectedScheme, setConfigurationType } = useStateContext()
+    const { setSelectedScheme } = useStateContext()
 
     const [name, setName] = useState<string>(InputSchemeManager.randomAvailableName)
     const [type, setType] = useState<DriveType>(DriveType.ARCADE)
@@ -24,22 +24,21 @@ const NewInputSchemeModal: React.FC<ModalImplProps<void, void>> = ({ modal }) =>
 
             InputSchemeManager.addCustomScheme(scheme)
             InputSchemeManager.saveSchemes()
-            console.log(InputSchemeManager.allInputSchemes)
 
-            setConfigurationType("INPUTS")
             setSelectedScheme(scheme)
             openPanel(
                 ConfigurePanel,
                 {
                     configMode: undefined,
                     selectedAssembly: undefined,
+                    configurationType: "INPUTS",
                 },
                 modal,
                 { position: "left" }
             )
         }
         configureScreen(modal!, { title: "New Input Scheme", hideCancel: true }, { onBeforeAccept })
-    }, [name, setConfigurationType, setSelectedScheme, openPanel, modal])
+    }, [name, setSelectedScheme, openPanel, modal])
 
     return (
         <>
diff --git a/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx b/fission/src/ui/modals/mirabuf/ImportLocalMirabufModal.tsx
@@ -10,6 +10,7 @@ import ImportMirabufPanel from "@/ui/panels/mirabuf/ImportMirabufPanel"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import { Button, Stack, styled, ToggleButton, ToggleButtonGroup } from "@mui/material"
 import { type ChangeEvent, useEffect, useState } from "react"
+import { ConfigurationType } from "@/ui/panels/configuring/assembly-config/ConfigTypes"
 
 const VisuallyHiddenInput = styled("input")({
     clip: "rect(0 0 0 0)",
@@ -38,7 +39,9 @@ const ImportLocalMirabufModal: React.FC<ModalImplProps<void, void>> = ({ modal }
     }
 
     useEffect(() => {
-        const onCancel = () => openPanel(ImportMirabufPanel, undefined, undefined)
+        const onCancel = () => {
+            openPanel(ImportMirabufPanel, { configurationType: "ROBOTS" as ConfigurationType })
+        }
 
         const onBeforeAccept = async () => {
             if (selectedFile && miraType !== undefined) {
diff --git a/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx b/fission/src/ui/panels/configuring/ChooseInputSchemePanel.tsx
@@ -16,7 +16,7 @@ import NewInputSchemeModal from "@/ui/modals/configuring/inputs/NewInputSchemeMo
 
 const ChooseInputSchemePanel: React.FC<PanelImplProps<void, void>> = ({ panel }) => {
     const { openModal, openPanel, closePanel, configureScreen } = useUIContext()
-    const { setSelectedScheme, setConfigurationType } = useStateContext()
+    const { setSelectedScheme } = useStateContext()
 
     const targetAssembly = useMemo(() => {
         const assembly = getSpotlightAssembly()
@@ -44,7 +44,6 @@ const ChooseInputSchemePanel: React.FC<PanelImplProps<void, void>> = ({ panel })
             if (scheme) {
                 InputSystem.brainIndexSchemeMap.set(brainIndex, scheme)
             }
-            setConfigurationType("INPUTS")
             if (scheme) setSelectedScheme(scheme)
         }
     }, [closePanel, targetAssembly])
diff --git a/fission/src/ui/panels/configuring/assembly-config/ConfigurePanel.tsx b/fission/src/ui/panels/configuring/assembly-config/ConfigurePanel.tsx
@@ -12,7 +12,6 @@ import type { FieldPreferences, MotorPreferences, RobotPreferences } from "@/sys
 import type SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
 import World from "@/systems/World"
 import type { PanelImplProps } from "@/ui/components/Panel"
-import { useStateContext } from "@/ui/helpers/StateProviderHelpers"
 import { CloseType, useUIContext, type UIScreen } from "@/ui/helpers/UIProviderHelpers"
 import ChooseInputSchemePanel from "../ChooseInputSchemePanel"
 import AssemblySelection, { type AssemblySelectionOption } from "./configure/AssemblySelection"
@@ -31,12 +30,7 @@ import ConfigureScoringZonesInterface from "./interfaces/scoring/ConfigureScorin
 import Label from "@/ui/components/Label"
 import DrivetrainSelectionInterface from "./interfaces/DrivetrainSelectionInterface"
 import TransformGizmoControl from "@/ui/components/TransformGizmoControl"
-import { ConfigMode, CONFIG_OPTS } from "./ConfigTypes"
-
-export interface ConfigurePanelSettings {
-    configMode?: ConfigMode
-    selectedAssembly: MirabufSceneObject
-}
+import { ConfigMode, CONFIG_OPTS, ConfigurationType } from "./ConfigTypes"
 
 interface ConfigInterfaceProps<T, P> {
     panel: UIScreen<T, P>
@@ -123,16 +117,21 @@ const ConfigInterface: React.FC<ConfigInterfaceProps<void, ConfigurePanelCustomP
 export interface ConfigurePanelCustomProps {
     selectedAssembly?: MirabufSceneObject
     configMode?: ConfigMode
+    configurationType?: ConfigurationType
 }
 
 const ConfigurePanel: React.FC<PanelImplProps<void, ConfigurePanelCustomProps>> = ({ panel }) => {
     const { configureScreen } = useUIContext()
-    const { configurationType, setConfigurationType } = useStateContext()
 
-    const { configMode: initialConfigMode, selectedAssembly: initialSelectedAssembly } = panel!.props.custom
+    const {
+        configMode: initialConfigMode,
+        selectedAssembly: initialSelectedAssembly,
+        configurationType: initialConfigurationType,
+    } = panel!.props.custom
 
     const [selectedAssembly, setSelectedAssembly] = useState<MirabufSceneObject | undefined>(initialSelectedAssembly)
     const [configMode, setConfigMode] = useState<ConfigMode | undefined>(initialConfigMode)
+    const [configurationType, setConfigurationType] = useState<ConfigurationType>(initialConfigurationType ?? "ROBOTS")
     const [pendingDeletes, setPendingDeletes] = useState<number[]>([])
 
     const originalRobotPrefs = useRef<RobotPreferences | null>(null)
@@ -169,7 +168,6 @@ const ConfigurePanel: React.FC<PanelImplProps<void, ConfigurePanelCustomProps>>
             originalMotorPrefs.current = null
             originalInputSchemes.current = null
 
-            setConfigurationType(configurationType)
             new ConfigurationSavedEvent()
         }
         const onCancel = () => {
@@ -201,7 +199,7 @@ const ConfigurePanel: React.FC<PanelImplProps<void, ConfigurePanelCustomProps>>
             { title: "Configure Assets", acceptText: "Save", cancelText: "Cancel" },
             { onBeforeAccept, onCancel }
         )
-    }, [configurationType, selectedAssembly, pendingDeletes])
+    }, [selectedAssembly, pendingDeletes])
 
     const modes = useMemo(() => {
         switch (configurationType) {
diff --git a/fission/src/ui/panels/configuring/assembly-config/configure/AssemblySelection.tsx b/fission/src/ui/panels/configuring/assembly-config/configure/AssemblySelection.tsx
@@ -30,8 +30,9 @@ export class AssemblySelectionOption extends SelectMenuOption {
 }
 
 function makeSelectionOption(configurationType: ConfigurationType, assembly: MirabufSceneObject) {
+    console.log("MAKING SELECTION OPTION FOR", configurationType)
     return new AssemblySelectionOption(
-        `${configurationType === "ROBOTS" ? `[${InputSystem.brainIndexSchemeMap.get((assembly.brain as SynthesisBrain).brainIndex)?.schemeName ?? "-"}]` : ""} ${assembly.assemblyName}`,
+        `${configurationType === "ROBOTS" ? `[${InputSystem.brainIndexSchemeMap.get((assembly.brain as SynthesisBrain).brainIndex)?.schemeName ?? "-"}] ` : ""}${assembly.assemblyName}`,
         assembly
     )
 }
@@ -59,6 +60,8 @@ const AssemblySelection: React.FC<AssemblySelectionProps & PanelImplProps<void,
             .filter(x => !pendingDeletes.includes(x.id))
     }, [u, pendingDeletes])
 
+    console.log(robots[0], fields[0])
+
     const options = useMemo(() => {
         const list = configurationType === "ROBOTS" ? robots : fields
         return list
@@ -76,7 +79,7 @@ const AssemblySelection: React.FC<AssemblySelectionProps & PanelImplProps<void,
                 update()
             }}
             onAddClicked={() => {
-                openPanel(ImportMirabufPanel, undefined, undefined)
+                openPanel(ImportMirabufPanel, { configurationType })
                 closePanel(panel!.id, CloseType.Overwrite)
             }}
             noOptionsText={`No ${configurationType === "ROBOTS" ? "robots" : "fields"} spawned!`}
diff --git a/fission/src/ui/panels/configuring/initial-config/InitialConfigPanel.tsx b/fission/src/ui/panels/configuring/initial-config/InitialConfigPanel.tsx
@@ -22,7 +22,7 @@ import NewInputSchemeModal from "@/ui/modals/configuring/inputs/NewInputSchemeMo
 
 const InitialConfigPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) => {
     // TODO: can we pass these as custom props?
-    const { setSelectedScheme, setUnconfirmedImport, setConfigurationType } = useStateContext()
+    const { setSelectedScheme, setUnconfirmedImport } = useStateContext()
     const { openModal, closePanel, openPanel, configureScreen } = useUIContext()
     const [alliance, setAlliance] = useState<Alliance>("red")
     const [station, setStation] = useState<Station>(1)
@@ -43,7 +43,6 @@ const InitialConfigPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =>
             targetAssembly.station = station
             SimulationSystem.addPerRobotScore(targetAssembly, 0)
 
-            setConfigurationType("ROBOTS")
             const brainIndex = SynthesisBrain.getBrainIndex(targetAssembly)
 
             if (brainIndex === undefined) return
@@ -58,8 +57,6 @@ const InitialConfigPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =>
                 InputSystem.brainIndexSchemeMap.set(brainIndex, scheme)
                 setSelectedScheme(scheme)
             }
-        } else {
-            setConfigurationType("FIELDS")
         }
     }, [closePanel, panel, targetAssembly])
 
@@ -150,7 +147,7 @@ const InitialConfigPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =>
                 <InputSchemeSelection
                     brainIndex={brainIndex}
                     onSelect={() => {}}
-                    onEdit={() => openPanel(ConfigurePanel, {}, panel)}
+                    onEdit={() => openPanel(ConfigurePanel, { configurationType: "INPUTS" }, panel)}
                     onCreateNew={() => openModal(NewInputSchemeModal, undefined, panel)}
                 />
             )}
diff --git a/fission/src/ui/panels/configuring/initial-config/InputSchemeSelection.tsx b/fission/src/ui/panels/configuring/initial-config/InputSchemeSelection.tsx
@@ -20,7 +20,7 @@ interface InputSchemeSelectionProps {
 }
 
 export default function InputSchemeSelection({ brainIndex, onSelect, onEdit, onCreateNew }: InputSchemeSelectionProps) {
-    const { setSelectedScheme, setConfigurationType } = useStateContext()
+    const { setSelectedScheme } = useStateContext()
     const [_, update] = useReducer(x => !x, false)
     const [robotDriveType, setRobotDriveType] = useState<DriveType>(
         SynthesisBrain.brainIndexMap.get(brainIndex)?.driveType ?? DriveType.ARCADE
@@ -72,7 +72,6 @@ export default function InputSchemeSelection({ brainIndex, onSelect, onEdit, onC
                         {EditButton(() => {
                             InputSystem.brainIndexSchemeMap.set(brainIndex, scheme)
 
-                            setConfigurationType("INPUTS")
                             setSelectedScheme(scheme)
                             onEdit?.()
                         })}
diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -49,6 +49,7 @@ import { useStateContext } from "@/ui/helpers/StateProviderHelpers"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import type TaskStatus from "@/util/TaskStatus"
 import InitialConfigPanel from "../configuring/initial-config/InitialConfigPanel"
+import { ConfigurationType } from "../configuring/assembly-config/ConfigTypes"
 
 interface ItemCardProps {
     id: string
@@ -107,7 +108,7 @@ function spawnCachedMira(info: MirabufCacheInfo, type: MiraType, progressHandle?
     MirabufCachingService.get(info.id, type)
         .then(assembly => {
             if (assembly) {
-                createMirabuf(assembly).then(x => {
+                createMirabuf(assembly, progressHandle, info.id).then(x => {
                     if (x) {
                         World.sceneRenderer.registerSceneObject(x)
                         progressHandle.done()
@@ -130,9 +131,15 @@ function spawnCachedMira(info: MirabufCacheInfo, type: MiraType, progressHandle?
         })
 }
 
-const ImportMirabufPanel: React.FC<PanelImplProps<void, void>> = ({ panel, parent }) => {
+interface ImportMirabufPanelCustomProps {
+    configurationType: ConfigurationType
+}
+
+const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustomProps>> = ({ panel, parent }) => {
     const { addToast, closePanel, openModal, configureScreen } = useUIContext()
-    const { unconfirmedImport, configurationType, setConfigurationType } = useStateContext()
+    const { unconfirmedImport } = useStateContext()
+
+    const { configurationType } = panel!.props.custom
 
     const [cachedRobots, setCachedRobots] = useState(getCacheInfo(MiraType.ROBOT))
     const [cachedFields, setCachedFields] = useState(getCacheInfo(MiraType.FIELD))
@@ -418,7 +425,6 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, void>> = ({ panel, paren
     )
     useEffect(() => {
         setViewType(configurationType === "ROBOTS" ? MiraType.ROBOT : MiraType.FIELD)
-        setConfigurationType("ROBOTS")
     }, [])
     return (
         <Stack direction="column" gap={2} className="overflow-y-auto">

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ class InputSchemeManager {`
`126`	`126`	`const conflictingSchemes = scheme.inputs.flatMap(input =>`
`127`	`127`	`input.keysUsed.flatMap(key => usedKeyMap.get(key) ?? [])`
`128`	`128`	`)`
`129`		`- console.log(conflictingSchemes)`
	`129`	`+ // console.log(conflictingSchemes)`
`130`	`130`	`if (conflictingSchemes.length > 0) {`
`131`	`131`	`result[scheme.schemeName] ??= {`
`132`	`132`	`scheme,`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ const DragModeIndicator: React.FC = () => {`
`9`	`9`
`10`	`10`	`useEffect(() => {`
`11`	`11`	`const handleDragModeToggle = (event: CustomEvent) => {`
`12`		`- console.log("toggled")`
`13`	`12`	`setEnabled(event.detail.enabled)`
`14`	`13`	`}`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import NewInputSchemeModal from "@/ui/modals/configuring/inputs/NewInputSchemeMo`
`16`	`16`
`17`	`17`	`const ChooseInputSchemePanel: React.FC<PanelImplProps<void, void>> = ({ panel }) => {`
`18`	`18`	`const { openModal, openPanel, closePanel, configureScreen } = useUIContext()`
`19`		`- const { setSelectedScheme, setConfigurationType } = useStateContext()`
	`19`	`+ const { setSelectedScheme } = useStateContext()`
`20`	`20`
`21`	`21`	`const targetAssembly = useMemo(() => {`
`22`	`22`	`const assembly = getSpotlightAssembly()`
`@@ -44,7 +44,6 @@ const ChooseInputSchemePanel: React.FC<PanelImplProps<void, void>> = ({ panel })`
`44`	`44`	`if (scheme) {`
`45`	`45`	`InputSystem.brainIndexSchemeMap.set(brainIndex, scheme)`
`46`	`46`	`}`
`47`		`- setConfigurationType("INPUTS")`
`48`	`47`	`if (scheme) setSelectedScheme(scheme)`
`49`	`48`	`}`
`50`	`49`	`}, [closePanel, targetAssembly])`