preserve prematch fields

FRC2713 · Jan 19, 2025 · 4bd6795 · 4bd6795
1 parent afe3b14
commit 4bd6795
Show file tree

Hide file tree

Showing 10 changed files with 554 additions and 492 deletions.
diff --git a/config/2025/config.json b/config/2025/config.json
diff --git a/src/components/Sections/FormSection.tsx b/src/components/Sections/FormSection.tsx
@@ -35,7 +35,7 @@ export default function FormSection(props: SectionProps) {
             section={props.name}
             code={input.code}
             type={input.type}
-            preserveSection={section?.preserveDataOnReset}
+            preserveSection={section?.formResetBehavior === 'preserve'}
           />
         </InputCard>
       ))}

diff --git a/src/components/inputs/BaseInputProps.ts b/src/components/inputs/BaseInputProps.ts
@@ -11,12 +11,10 @@ export const inputBaseSchema = z.object({
   required: z.boolean().describe('Whether this input is required'),
   code: z.string().describe('A unique code for this input'),
   disabled: z.boolean().optional().describe('Whether this input is disabled'),
-  preserveDataOnReset: z
-    .boolean()
-    .optional()
-    .describe(
-      'Whether this input should be preserved when the scouting form is reset',
-    ),
+  formResetBehavior: z
+    .enum(['reset', 'preserve', 'increment'])
+    .default('reset')
+    .describe('The behavior of this input when the form is reset'),
   defaultValue: z.unknown().describe('The default value'),
 });
 
@@ -32,12 +30,6 @@ export const numberInputSchema = inputBaseSchema.extend({
   min: z.number().optional().describe('The minimum value'),
   max: z.number().optional().describe('The maximum value'),
   defaultValue: z.number().default(0).describe('The default value'),
-  autoIncrementOnReset: z
-    .boolean()
-    .optional()
-    .describe(
-      'Whether this input should auto-increment on reset, instead of resetting to the default value',
-    ),
 });
 
 export const selectInputSchema = inputBaseSchema.extend({
@@ -59,12 +51,6 @@ export const counterInputSchema = inputBaseSchema.extend({
   max: z.number().optional().describe('The maximum value'),
   step: z.number().optional().describe('The step value').default(1),
   defaultValue: z.number().default(0).describe('The default value'),
-  autoIncrementOnReset: z
-    .boolean()
-    .optional()
-    .describe(
-      'Whether this input should auto-increment on reset, instead of resetting to the default value',
-    ),
 });
 
 export const rangeInputSchema = inputBaseSchema.extend({
@@ -73,12 +59,6 @@ export const rangeInputSchema = inputBaseSchema.extend({
   max: z.number().optional().describe('The maximum value'),
   step: z.number().optional().describe('The step value').default(1),
   defaultValue: z.number().default(0).describe('The default value'),
-  autoIncrementOnReset: z
-    .boolean()
-    .optional()
-    .describe(
-      'Whether this input should auto-increment on reset, instead of resetting to the default value',
-    ),
 });
 
 export const booleanInputSchema = inputBaseSchema.extend({
@@ -93,7 +73,6 @@ export const timerInputSchema = inputBaseSchema.extend({
 
 export const sectionSchema = z.object({
   name: z.string(),
-  preserveDataOnReset: z.boolean().optional(),
   fields: z.array(
     z.discriminatedUnion('type', [
       counterInputSchema,

diff --git a/src/components/inputs/CheckboxInput.tsx b/src/components/inputs/CheckboxInput.tsx
@@ -16,16 +16,22 @@ export default function CheckboxInput(props: ConfigurableInputProps) {
 
   const [checked, setChecked] = React.useState(data.defaultValue);
 
-  const resetState = React.useCallback(({force}: {force: boolean}) => {
-    if (!force && (data.preserveDataOnReset || props.preserveSection)) {
-      return;
-    }
-    setChecked(data.defaultValue);
-  }, [data.defaultValue]);
+  const resetState = React.useCallback(
+    ({ force }: { force: boolean }) => {
+      if (force) {
+        setChecked(data.defaultValue);
+        return;
+      }
+      if (data.formResetBehavior === 'preserve' || props.preserveSection) {
+        return;
+      }
+      setChecked(data.defaultValue);
+    },
+    [data.defaultValue],
+  );
 
   useEvent('resetFields', resetState);
 
-
   useEffect(() => {
     updateValue(props.code, checked);
   }, [checked]);

diff --git a/src/components/inputs/CounterInput.tsx b/src/components/inputs/CounterInput.tsx
@@ -17,16 +17,30 @@ export default function CounterInput(props: ConfigurableInputProps) {
 
   const [value, setValue] = useState(data.defaultValue);
 
-  const resetState = useCallback(({force}: {force: boolean}) => {
-    if(!force && (data.preserveDataOnReset || props.preserveSection)) {
-      if (data.autoIncrementOnReset) {
-        const newVal = typeof value === 'number' ? value + data.step : 1;
-        setValue(newVal);
+  const resetState = useCallback(
+    ({ force }: { force: boolean }) => {
+      if (force) {
+        setValue(data.defaultValue);
+        return;
       }
-      return;
-    };
-    setValue(data.defaultValue);
-  }, [value]);
+      if (props.preserveSection) {
+        return;
+      }
+      switch (data.formResetBehavior) {
+        case 'reset':
+          setValue(data.defaultValue);
+          return;
+        case 'increment':
+          setValue(prev => (typeof prev === 'number' ? prev + data.step : 1));
+          return;
+        case 'preserve':
+          return;
+        default:
+          return;
+      }
+    },
+    [value],
+  );
 
   useEvent('resetFields', resetState);
 

diff --git a/src/components/inputs/NumberInput.tsx b/src/components/inputs/NumberInput.tsx
@@ -16,17 +16,32 @@ export default function NumberInput(props: ConfigurableInputProps) {
 
   const [value, setValue] = React.useState<number | ''>(data.defaultValue);
 
-  const resetState = useCallback(({force}: {force: boolean}) => {
-    if (!force && (data.preserveDataOnReset || props.preserveSection)) {
-      if (data.autoIncrementOnReset) {
-        const newVal = typeof value === 'number' ? value + 1 : 1;
-        setValue(newVal);
+  const resetState = useCallback(
+    ({ force }: { force: boolean }) => {
+      console.log(
+        `resetState ${data.code}`,
+        `force: ${force}`,
+        `behavior: ${data.formResetBehavior}`,
+      );
+      if (force) {
+        setValue(data.defaultValue);
+        return;
+      }
+      switch (data.formResetBehavior) {
+        case 'reset':
+          setValue(data.defaultValue);
+          return;
+        case 'increment':
+          setValue(prev => (typeof prev === 'number' ? prev + 1 : 1));
+          return;
+        case 'preserve':
+          return;
+        default:
+          return;
       }
-      return;
-    } else {
-      setValue(data.defaultValue);
-    }
-  }, [data.defaultValue, value]);
+    },
+    [data.defaultValue, value],
+  );
 
   useEvent('resetFields', resetState);
 

diff --git a/src/components/inputs/RangeInput.tsx b/src/components/inputs/RangeInput.tsx
@@ -16,16 +16,32 @@ export default function RangeInput(props: ConfigurableInputProps) {
 
   const [value, setValue] = useState(data.defaultValue);
 
-  const resetState = useCallback(({force}: {force: boolean}) => {
-    if (!force && (data.preserveDataOnReset || props.preserveSection)) {
-      if (data.autoIncrementOnReset) {
-        const newVal = typeof value === 'number' ? value + data.step : 1;
-        setValue(newVal);
+  const resetState = useCallback(
+    ({ force }: { force: boolean }) => {
+      if (force) {
+        setValue(data.defaultValue);
+        return;
       }
-      return;
-    }
-    setValue(data.defaultValue);
-  }, [data.defaultValue]);
+
+      if (props.preserveSection) {
+        return;
+      }
+
+      switch (data.formResetBehavior) {
+        case 'reset':
+          setValue(data.defaultValue);
+          return;
+        case 'increment':
+          setValue(prev => (typeof prev === 'number' ? prev + data.step : 1));
+          return;
+        case 'preserve':
+          return;
+        default:
+          return;
+      }
+    },
+    [data.defaultValue],
+  );
 
   useEvent('resetFields', resetState);
 

diff --git a/src/components/inputs/SelectInput.tsx b/src/components/inputs/SelectInput.tsx
@@ -26,12 +26,24 @@ export default function SelectInput(props: ConfigurableInputProps) {
     updateValue(props.code, value);
   }, [value]);
 
-  const resetState = useCallback(({force}: {force: boolean}) => {
-    if (!force && (data.preserveDataOnReset || props.preserveSection)) {
-      return;
-    }
-    setValue(data.defaultValue);
-  }, [data.defaultValue]);
+  const resetState = useCallback(
+    ({ force }: { force: boolean }) => {
+      console.log(
+        `resetState ${data.code}`,
+        `force: ${force}`,
+        `behavior: ${data.formResetBehavior}`,
+      );
+      if (force) {
+        setValue(data.defaultValue);
+        return;
+      }
+      if (data.formResetBehavior === 'preserve' || props.preserveSection) {
+        return;
+      }
+      setValue(data.defaultValue);
+    },
+    [data.defaultValue],
+  );
 
   useEvent('resetFields', resetState);
 

diff --git a/src/components/inputs/StringInput.tsx b/src/components/inputs/StringInput.tsx
@@ -16,12 +16,24 @@ export default function StringInput(props: ConfigurableInputProps) {
 
   const [value, setValue] = React.useState(data.defaultValue);
 
-  const resetState = useCallback(({force}: {force: boolean}) => {
-    if (!force && (data.preserveDataOnReset || props.preserveSection)) {
-      return;
-    }
-    setValue(data.defaultValue);
-  }, [data.defaultValue]);
+  const resetState = useCallback(
+    ({ force }: { force: boolean }) => {
+      console.log(
+        `resetState ${data.code}`,
+        `force: ${force}`,
+        `behavior: ${data.formResetBehavior}`,
+      );
+      if (force) {
+        setValue(data.defaultValue);
+        return;
+      }
+      if (data.formResetBehavior === 'preserve' || props.preserveSection) {
+        return;
+      }
+      setValue(data.defaultValue);
+    },
+    [data.defaultValue],
+  );
 
   useEvent('resetFields', resetState);
 

diff --git a/src/components/inputs/TimerInput.tsx b/src/components/inputs/TimerInput.tsx
@@ -31,8 +31,15 @@ export default function TimerInput(props: ConfigurableInputProps) {
 
   const average = useMemo(() => getAvg(times), [times]);
 
-  const resetState = useCallback(({force}: {force: boolean}) => {
-    if (!force && (data.preserveDataOnReset || props.preserveSection)) {
+  const resetState = useCallback(({ force }: { force: boolean }) => {
+    if (force) {
+      setTime(data.defaultValue);
+      toggleTimer(false);
+      setTimes([]);
+      updateValue(props.code, data.defaultValue);
+      return;
+    }
+    if (data.formResetBehavior === 'preserve' || props.preserveSection) {
       return;
     }
 
@@ -43,7 +50,7 @@ export default function TimerInput(props: ConfigurableInputProps) {
   }, []);
 
   useEvent('resetFields', resetState);
-  
+
   function startStop() {
     toggleTimer(!isRunning);
   }
@@ -84,7 +91,7 @@ export default function TimerInput(props: ConfigurableInputProps) {
         <Button variant="outline" disabled={time === 0} onClick={() => lap()}>
           <TimerReset className="size-4" />
         </Button>
-        <Button variant="outline" onClick={() => resetState({force: false})}>
+        <Button variant="outline" onClick={() => resetState({ force: false })}>
           <Undo className="size-4" />
         </Button>
       </div>