Merge pull request #25 from FRC2713/preserveDataOnReset

add preserveDataOnReset to each field
FRC2713 · Feb 23, 2024 · e335d89 · e335d89
2 parents 2994874 + fae3d95
commit e335d89
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 32 deletions.
diff --git a/config/2024/config.json b/config/2024/config.json
@@ -5,13 +5,13 @@
   "sections": [
     {
       "name": "Prematch",
-      "preserveDataOnReset": true,
       "fields": [
         {
           "title": "Scouter Initials",
           "type": "text",
           "required": true,
-          "code": "scouter"
+          "code": "scouter",
+          "preserveDataOnReset": true
         },
         {
           "title": "Match Number",
@@ -32,7 +32,8 @@
             "B2": "Blue 2",
             "B3": "Blue 3"
           },
-          "defaultValue": "R1"
+          "defaultValue": "R1",
+          "preserveDataOnReset": true
         },
         {
           "title": "Team Number",

diff --git a/config/schema.json b/config/schema.json
@@ -62,6 +62,10 @@
         "disabled": {
           "type": "boolean"
         },
+        "preserveDataOnReset": {
+          "type": "boolean",
+          "description": "If true, field data will not be cleared when the scouting form is reset."
+        },
         "value": {},
         "choices": {
           "type": "object",

diff --git a/src/components/QR/CloseButton.tsx b/src/components/QR/CloseButton.tsx
@@ -5,7 +5,7 @@ export type CloseButtonProps = {
 export function CloseButton(props: CloseButtonProps) {
   return (
     <button
-      className="focus:shadow-outline rounded-full text-gray-800 absolute top-0 right-0 m-2 p-2 hover:bg-gray-200 "
+      className="focus:shadow-outline rounded-full text-gray-500 absolute top-0 right-0 m-2 p-2 hover:text-gray-800 "
       type="button"
       onClick={props.onClick}
     >

diff --git a/src/components/QR/CopyButton.tsx b/src/components/QR/CopyButton.tsx
@@ -7,7 +7,7 @@ export function CopyButton(props: CopyButtonProps) {
   return (
     <div onClick={props.onCopy} className={props.className}>
       <svg
-        className="text-gray-500 hover:text-gray-800 "
+        className="text-gray-400 hover:text-gray-800 "
         width="24"
         height="24"
         viewBox="0 0 24 24"

diff --git a/src/components/QR/PreviewText.tsx b/src/components/QR/PreviewText.tsx
@@ -6,9 +6,9 @@ export type PreviewTextProps = {
 export function PreviewText(props: PreviewTextProps) {
   const chunks = props.data.split('\t');
   return (
-    <div className="flex flex-col items-end gap-2">
-      <div className="text-left p-2 bg-gray-100 rounded-md shadow-md dark:bg-gray-600 mt-2">
-        <p className=" font-mono text-wrap break-all text-gray-800 dark:text-gray-200">
+    <div className="flex flex-col items-center gap-2 shadow-md bg-gray-600 m-2 p-2 rounded-md">
+      <div className="text-justify p-2 rounded bg-gray-600 ">
+        <p className=" font-mono text-wrap break-all text-gray-200 ">
           {chunks.map((c, i) => (
             <>
               <span key={i + c}>{c}</span>

diff --git a/src/components/QR/QRModal.tsx b/src/components/QR/QRModal.tsx
@@ -39,13 +39,12 @@ export function QRModal(props: QRModalProps) {
           />
           <div
             ref={modalRef}
-            className="fixed top-20 rounded-md bg-white border p-5 shadow-lg w-96"
+            className="fixed top-20 rounded-md bg-white border shadow-lg w-96"
           >
-            <div className="flex flex-col items-center ">
-              <h1 className="text-4xl text-black font-mono ">{title}</h1>
+            <div className="flex flex-col items-center pt-8 ">
               <CloseButton onClick={props.onDismiss} />
               <QRCode className="m-2 mt-4" size={256} value={qrCodeData} />
-              <div className="h-1 w-full border-t border-gray-800 my-2" />
+              <h1 className="text-3xl text-gray-800 font-rhr-ns ">{title}</h1>
               <PreviewText data={qrCodeData} />
             </div>
           </div>

diff --git a/src/components/inputs/BaseInputProps.ts b/src/components/inputs/BaseInputProps.ts
@@ -1,31 +1,32 @@
 export default interface BaseInputProps extends InputProps {
-  section: string
-  onChange: (value: any) => void
+  section: string;
+  onChange: (value: any) => void;
 }
 export interface Config {
-  title: string
-  page_title: string
-  sections: SectionProps[]
+  title: string;
+  page_title: string;
+  sections: SectionProps[];
 }
 
 export interface SectionProps {
-  name: string
-  preserveDataOnReset?: boolean
-  fields: InputProps[]
+  name: string;
+  preserveDataOnReset?: boolean;
+  fields: InputProps[];
 }
 
 export interface InputProps {
-  title: string
-  type: InputTypes
-  required: boolean
+  title: string;
+  type: InputTypes;
+  required: boolean;
   // A shorthand code for this input
-  code: string
-  disabled?: boolean
-  value?: any
-  choices?: Record<string, string>
-  defaultValue?: any
-  min?: number
-  max?: number
+  code: string;
+  disabled?: boolean;
+  preserveDataOnReset?: boolean;
+  value?: any;
+  choices?: Record<string, string>;
+  defaultValue?: any;
+  min?: number;
+  max?: number;
 }
 
 export type InputTypes =
@@ -35,4 +36,4 @@ export type InputTypes =
   | 'range'
   | 'select'
   | 'counter'
-  | 'image'
+  | 'image';
diff --git a/src/store/store.ts b/src/store/store.ts
@@ -61,7 +61,9 @@ export function resetSections() {
         .map(s => s.fields)
         .flat()
         .forEach(f => {
-          f.value = f.defaultValue;
+          if (!f.preserveDataOnReset) {
+            f.value = f.defaultValue;
+          }
         }),
     ),
   );