Use BallotInterpretation data model on frontend

votingworks · Apr 23, 2020 · 89c50e4 · 89c50e4
1 parent 63c82d7
commit 89c50e4
Show file tree

Hide file tree

Showing 16 changed files with 1,135 additions and 404 deletions.
diff --git a/arlo-client/.prettierrc.js b/arlo-client/.prettierrc.js
@@ -1,7 +1,6 @@
 module.exports = {
-    proseWrap: 'always',
-    semi: false,
-    singleQuote: true,
-    trailingComma: 'es5',
-  }
-
+  proseWrap: 'always',
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'es5',
+}
diff --git a/arlo-client/src/components/Atoms/Form/FormField.tsx b/arlo-client/src/components/Atoms/Form/FormField.tsx
@@ -52,7 +52,7 @@ export interface IProps {
   >
   disabled?: boolean
   value?: string | number
-  onChange?: (e: React.ChangeEvent) => void
+  onChange?: (e: React.FormEvent) => void
   onBlur?: (e: React.FocusEvent) => void
   name?: string
   type?: string
@@ -80,20 +80,9 @@ const FormField: React.FC<IProps> = ({
         onBlur={() => setFieldTouched(field.name)}
       />
     ) : type === 'textarea' ? (
-      <Area
-        disabled={disabled}
-        {...field}
-        {...rest}
-        onChange={field.onChange}
-      />
+      <Area disabled={disabled} onChange={rest.onChange} {...field} {...rest} />
     ) : (
-      <Field
-        disabled={disabled}
-        type={type}
-        {...field}
-        {...rest}
-        onChange={field.onChange}
-      />
+      <Field disabled={disabled} type={type} {...field} {...rest} />
     )}
     {getIn(errors, field.name) && getIn(touched, field.name) && (
       <ErrorLabel data-testid={`${field.name}-error`}>

diff --git a/arlo-client/src/components/Audit/__snapshots__/CalculateRiskMeasurement.test.tsx.snap b/arlo-client/src/components/Audit/__snapshots__/CalculateRiskMeasurement.test.tsx.snap
@@ -2236,7 +2236,7 @@ exports[`CalculateRiskMeasurement renders online mode progress bar 1`] = `
         >
           <div
             class="bp3-progress-meter"
-            style="width: 50%;"
+            style="width: 100%;"
           />
         </div>
       </div>
@@ -2525,7 +2525,7 @@ exports[`CalculateRiskMeasurement renders online mode progress bar in multiple r
         >
           <div
             class="bp3-progress-meter"
-            style="width: 50%;"
+            style="width: 100%;"
           />
         </div>
       </div>