Merge dev

BrandonPacewic · BrandonPacewic · commit a4e70f5c86e6 · 2025-08-07T15:43:22.000-07:00
* 'dev' of github.com:Autodesk/synthesis:
  fix: prevent custom configs from showing as defaults
  feat: clean up match mode config parsing
diff --git a/fission/src/systems/match_mode/DefaultMatchModeConfigs.ts b/fission/src/systems/match_mode/DefaultMatchModeConfigs.ts
@@ -67,6 +67,22 @@ class DefaultMatchModeConfigs {
         }
     }
 
+    static fallbackValues = (): MatchModeConfig => {
+        return {
+            id: "default",
+            name: "Default",
+            isDefault: true,
+            autonomousTime: 15,
+            teleopTime: 135,
+            endgameTime: 20,
+            ignoreRotation: true,
+            maxHeight: Infinity,
+            heightLimitPenalty: 2,
+            sideMaxExtension: Infinity,
+            sideExtensionPenalty: 2,
+        }
+    }
+
     /** @returns {MatchModeConfig[]} New copies of the default match mode configs without reference to any others. */
     public static get defaultMatchModeConfigCopies(): MatchModeConfig[] {
         return [
diff --git a/fission/src/systems/match_mode/MatchMode.ts b/fission/src/systems/match_mode/MatchMode.ts
@@ -2,22 +2,13 @@ import beep from "@/assets/sound-files/beep.wav"
 import MatchEnd from "@/assets/sound-files/MatchEnd.wav"
 import MatchResume from "@/assets/sound-files/MatchResume.wav"
 import MatchStart from "@/assets/sound-files/MatchStart.wav"
-import { globalOpenModal } from "@/ui/components/GlobalUIControls"
-import MatchResultsModal from "@/ui/modals/MatchResultsModal"
+import { globalOpenModal } from "@/components/GlobalUIControls.ts"
+import MatchResultsModal from "@/modals/MatchResultsModal.tsx"
+import DefaultMatchModeConfigs from "@/systems/match_mode/DefaultMatchModeConfigs.ts"
 import type { MatchModeConfig } from "@/ui/panels/configuring/MatchModeConfigPanel"
 import SimulationSystem from "../simulation/SimulationSystem"
 import { SoundPlayer } from "../sound/SoundPlayer"
-import {
-    DEFAULT_AUTONOMOUS_TIME,
-    DEFAULT_ENDGAME_TIME,
-    DEFAULT_HEIGHT_LIMIT_PENALTY,
-    DEFAULT_IGNORE_ROTATION,
-    DEFAULT_MAX_HEIGHT,
-    DEFAULT_SIDE_EXTENSION_PENALTY,
-    DEFAULT_SIDE_MAX_EXTENSION,
-    DEFAULT_TELEOP_TIME,
-    MatchModeType,
-} from "./MatchModeTypes"
+import { MatchModeType } from "./MatchModeTypes"
 import RobotDimensionTracker from "./RobotDimensionTracker"
 
 class MatchMode {
@@ -35,19 +26,7 @@ class MatchMode {
     private _intervalId: number | null = null
 
     // Match Mode Config
-    private _matchModeConfig: MatchModeConfig = {
-        id: "default",
-        name: "Default",
-        isDefault: true,
-        autonomousTime: DEFAULT_AUTONOMOUS_TIME,
-        teleopTime: DEFAULT_TELEOP_TIME,
-        endgameTime: DEFAULT_ENDGAME_TIME,
-        ignoreRotation: DEFAULT_IGNORE_ROTATION,
-        maxHeight: DEFAULT_MAX_HEIGHT,
-        heightLimitPenalty: DEFAULT_HEIGHT_LIMIT_PENALTY,
-        sideExtensionPenalty: DEFAULT_SIDE_EXTENSION_PENALTY,
-        sideMaxExtension: DEFAULT_SIDE_MAX_EXTENSION,
-    }
+    private _matchModeConfig: MatchModeConfig = DefaultMatchModeConfigs.fallbackValues()
 
     private constructor() {}
 
diff --git a/fission/src/systems/match_mode/MatchModeTypes.ts b/fission/src/systems/match_mode/MatchModeTypes.ts
@@ -5,13 +5,3 @@ export enum MatchModeType {
     ENDGAME = "Endgame",
     MATCH_ENDED = "Match Ended",
 }
-
-// Default match mode timing values
-export const DEFAULT_AUTONOMOUS_TIME = 15
-export const DEFAULT_TELEOP_TIME = 135
-export const DEFAULT_ENDGAME_TIME = 20
-export const DEFAULT_IGNORE_ROTATION = true
-export const DEFAULT_MAX_HEIGHT = Infinity
-export const DEFAULT_HEIGHT_LIMIT_PENALTY = 2
-export const DEFAULT_SIDE_MAX_EXTENSION = Infinity
-export const DEFAULT_SIDE_EXTENSION_PENALTY = 2
diff --git a/fission/src/test/RobotDimensionsTracker.test.ts b/fission/src/test/RobotDimensionsTracker.test.ts
@@ -3,7 +3,7 @@ import { MiraType } from "@/mirabuf/MirabufLoader"
 import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import RobotDimensionTracker from "@/systems/match_mode/RobotDimensionTracker"
 import SimulationSystem from "@/systems/simulation/SimulationSystem"
-import World from "@/systems/World.ts"
+import World from "@/systems/World"
 
 interface MockDimensions {
     width: number
@@ -48,14 +48,6 @@ vi.mock("@/systems/match_mode/MatchMode", () => ({
         TELEOP: 2,
         MATCH_ENDED: 3,
     },
-    DEFAULT_AUTONOMOUS_TIME: 15,
-    DEFAULT_TELEOP_TIME: 135,
-    DEFAULT_ENDGAME_TIME: 20,
-    DEFAULT_IGNORE_ROTATION: true,
-    DEFAULT_MAX_HEIGHT: Infinity,
-    DEFAULT_HEIGHT_LIMIT_PENALTY: 2,
-    DEFAULT_SIDE_MAX_EXTENSION: 1.5,
-    DEFAULT_SIDE_EXTENSION_PENALTY: 2,
 }))
 
 vi.mock("@/systems/simulation/SimulationSystem", () => ({
diff --git a/fission/src/ui/panels/configuring/MatchModeConfigPanel.tsx b/fission/src/ui/panels/configuring/MatchModeConfigPanel.tsx
@@ -4,22 +4,12 @@ import type React from "react"
 import { type ChangeEvent, useEffect, useMemo, useRef, useState } from "react"
 import DefaultMatchModeConfigs from "@/systems/match_mode/DefaultMatchModeConfigs"
 import MatchMode from "@/systems/match_mode/MatchMode"
-import {
-    DEFAULT_AUTONOMOUS_TIME,
-    DEFAULT_ENDGAME_TIME,
-    DEFAULT_HEIGHT_LIMIT_PENALTY,
-    DEFAULT_IGNORE_ROTATION,
-    DEFAULT_MAX_HEIGHT,
-    DEFAULT_SIDE_EXTENSION_PENALTY,
-    DEFAULT_SIDE_MAX_EXTENSION,
-    DEFAULT_TELEOP_TIME,
-} from "@/systems/match_mode/MatchModeTypes"
+
 import { globalAddToast } from "@/ui/components/GlobalUIControls"
 import Label from "@/ui/components/Label"
 import type { PanelImplProps } from "@/ui/components/Panel"
 import { NegativeButton, PositiveButton, SynthesisIcons } from "@/ui/components/StyledComponents"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
-import { convertFeetToMeters } from "@/util/UnitConversions"
 
 /**
  * Configuration for match mode rules and timing.
@@ -55,7 +45,6 @@ export interface MatchModeConfig {
 
     /**
      * Maximum allowed robot height in meters (stored internally).
-     * User input is in feet but converted to meters during config processing.
      * Set to Infinity for no height limit. (default: Infinity)
      */
     maxHeight: number
@@ -80,6 +69,19 @@ export interface MatchModeConfig {
     sideExtensionPenalty: number
 }
 
+const props: Readonly<{ id: keyof MatchModeConfig; expectedType: string; required: boolean }>[] = [
+    { id: "id", expectedType: "string", required: true },
+    { id: "name", expectedType: "string", required: true },
+    { id: "autonomousTime", expectedType: "number", required: false },
+    { id: "teleopTime", expectedType: "number", required: false },
+    { id: "endgameTime", expectedType: "number", required: false },
+    { id: "ignoreRotation", expectedType: "boolean", required: false },
+    { id: "maxHeight", expectedType: "number", required: false },
+    { id: "heightLimitPenalty", expectedType: "number", required: false },
+    { id: "sideMaxExtension", expectedType: "number", required: false },
+    { id: "sideExtensionPenalty", expectedType: "number", required: false },
+]
+
 function matchConfigSelected(config: MatchModeConfig) {
     if (MatchMode.getInstance().isMatchEnabled()) {
         globalAddToast(
@@ -196,87 +198,53 @@ const MatchModeConfigPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =
     }
 
     const validateAndNormalizeMatchModeConfig = (config: unknown): MatchModeConfig | null => {
-        let valid = true
-
         // Type guard to check if config is an object
         if (typeof config !== "object" || config === null) {
             console.error("Match mode config validation failed: config must be an object")
             globalAddToast("error", "Invalid Match Mode Config", "Configuration must be an object")
             return null
         }
-
         const configObj = config as Record<string, unknown>
 
-        const props: { id: string; expectedType: string; required: boolean }[] = [
-            { id: "id", expectedType: "string", required: true },
-            { id: "name", expectedType: "string", required: true },
-            { id: "autonomousTime", expectedType: "number", required: false },
-            { id: "teleopTime", expectedType: "number", required: false },
-            { id: "endgameTime", expectedType: "number", required: false },
-            { id: "ignoreRotation", expectedType: "boolean", required: false },
-            { id: "maxHeight", expectedType: "number", required: false },
-            { id: "heightLimitPenalty", expectedType: "number", required: false },
-            { id: "sideMaxExtension", expectedType: "number", required: false },
-            { id: "sideExtensionPenalty", expectedType: "number", required: false },
-        ]
-
         const typeError = (id: string, expectedType?: string) => {
             const errorMessage = expectedType ? `must be a ${expectedType}` : "is required"
             console.error(`Match mode config validation failed: the '${id}' field ${errorMessage}`)
             globalAddToast("error", "Invalid Match Mode Config", `The '${id}' field ${errorMessage}`)
         }
 
-        for (const prop of props) {
-            if (configObj[prop.id] == undefined) {
-                if (prop.required) {
-                    typeError(prop.id)
-                    valid = false
-                }
-            } else if (typeof configObj[prop.id] != prop.expectedType) {
-                if (prop.required) {
-                    typeError(prop.id, prop.expectedType)
-                    valid = false
-                } else {
-                    globalAddToast(
-                        "warning",
-                        "Invalid Match Mode Config",
-                        `The '${prop.id}' field must be a ${prop.expectedType}, ignoring ${prop.id} field`
-                    )
+        function checkValidity(configObj: Record<string, unknown>): configObj is Partial<MatchModeConfig> {
+            for (const prop of props) {
+                if (configObj[prop.id] == undefined) {
+                    if (prop.required) {
+                        typeError(prop.id)
+                        return false
+                    }
+                } else if (typeof configObj[prop.id] != prop.expectedType) {
+                    if (prop.required) {
+                        typeError(prop.id, prop.expectedType)
+                        return false
+                    } else {
+                        globalAddToast(
+                            "warning",
+                            "Invalid Match Mode Config",
+                            `The '${prop.id}' field must be a ${prop.expectedType}, ignoring ${prop.id} field`
+                        )
+                    }
                 }
             }
+            return true
         }
 
-        if (!valid) {
+        if (!checkValidity(configObj)) {
             return null
         }
 
-        // If validation passes, normalize the config with defaults for missing fields
-        const normalizedConfig: MatchModeConfig = {
-            id: configObj.id as string,
-            name: configObj.name as string,
-            isDefault: false, // User-uploaded configs are not default configs
-            autonomousTime:
-                typeof configObj.autonomousTime === "number" ? configObj.autonomousTime : DEFAULT_AUTONOMOUS_TIME,
-            teleopTime: typeof configObj.teleopTime === "number" ? configObj.teleopTime : DEFAULT_TELEOP_TIME,
-            endgameTime: typeof configObj.endgameTime === "number" ? configObj.endgameTime : DEFAULT_ENDGAME_TIME,
-            ignoreRotation:
-                typeof configObj.ignoreRotation === "boolean" ? configObj.ignoreRotation : DEFAULT_IGNORE_ROTATION,
-            maxHeight:
-                typeof configObj.maxHeight === "number" ? convertFeetToMeters(configObj.maxHeight) : DEFAULT_MAX_HEIGHT,
-            heightLimitPenalty:
-                typeof configObj.heightLimitPenalty === "number"
-                    ? configObj.heightLimitPenalty
-                    : DEFAULT_HEIGHT_LIMIT_PENALTY,
-            sideMaxExtension:
-                typeof configObj.sideMaxExtension === "number"
-                    ? convertFeetToMeters(configObj.sideMaxExtension)
-                    : DEFAULT_SIDE_MAX_EXTENSION,
-            sideExtensionPenalty:
-                typeof configObj.sideExtensionPenalty === "number"
-                    ? configObj.sideExtensionPenalty
-                    : DEFAULT_SIDE_EXTENSION_PENALTY,
+        // If validation passes, use the default values in any missing fields
+        const normalizedConfig = {
+            ...DefaultMatchModeConfigs.fallbackValues(),
+            ...configObj,
         }
-
+        normalizedConfig.isDefault = false
         return normalizedConfig
     }
 
