From 42819cf2fcb6f4b8b705a556773b7a60f799d56b Mon Sep 17 00:00:00 2001
From: "Silvio J. Gutierrez" <silviogutierrez@gmail.com>
Date: Sat, 7 Jul 2018 19:07:18 -0400
Subject: [PATCH] Field errors.

---
 components/Form.tsx    |  20 ++++++++++++++++----
 server/db.sqlite3      | Bin 143360 -> 147456 bytes
 server/server/views.py |   8 +++++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/components/Form.tsx b/components/Form.tsx
index 628c456ff..1750aa7e7 100644
--- a/components/Form.tsx
+++ b/components/Form.tsx
@@ -3,6 +3,8 @@ import React from 'react';
 import {Widget, WidgetType} from './Widget';
 
 interface Field {
+    name: string;
+    label: string;
     widget: WidgetType;
 }
 
@@ -10,7 +12,7 @@ type FormError = string[];
 
 export type FormType = {
     errors: {
-        [name: string]: FormError;
+        [name: string]: FormError|null;
     };
     fields: Field[];
 }
@@ -23,12 +25,22 @@ interface Props {
 export const Form = (props: Props) => {
     return <form method="POST" action="">
         <input type="hidden" name="csrfmiddlewaretoken" value={props.csrf_token} />
-        {Object.keys(props.form.errors).length > 0 &&
+        {/*Object.keys(props.form.errors).length > 0 &&
         <pre>{JSON.stringify(props.form.errors, null, 2)}</pre>
-        }
+        */}
         {props.form.fields.map(field =>
         <div key={field.widget.name}>
-            <Widget widget={field.widget} />
+            <label>
+                {field.label}
+                <Widget widget={field.widget} />
+            </label>
+            {props.form.errors[field.name] != null &&
+            <ul>
+                {props.form.errors[field.name]!.map((error, index) =>
+                <li key={index}>{error}</li>
+                )}
+            </ul>
+            }
         </div>
         )}
         <button type="submit">Submit</button>
diff --git a/server/db.sqlite3 b/server/db.sqlite3
index d762083358e12c3618d6337b6e12218d0adab1fe..10cbdc5f809f15abc02584119d90f5c6b7218497 100644
GIT binary patch
delta 1366
zcmb`HU5Fc16vyXeX7aI<nKRpEH*UUW)}~}*x+ZbEB(boyZ1<s7t)kGCs*{*Z(|k^v
zWLwq;H&LuFKD4ed`mhyRZDj?q4Vs7gg<4Q43bj<(mt6!!p`lPHMNsOU*=@>dA06&J
zGxyv-_uO;t{Y`V#-fTLKdHNF+MFmLrlMbX$AKy9-iL<G<(eB~NSme43Hc_&0-F8g8
z!0p*BvXpDz&UCh%uSBEKaiyf?)Jmf^r=+u4C7o&HwTg0}l+G!cgIYeL)*pz*5@XRg
zX>u(2AZgLq{jo%Jd?L|Kcz>k%)A%{+*upYi#>?#yc@kZ2d$y3S<TSD*iDE=h6s?q9
zC`S&^@_?{#B@zPhT$GV_$$X2#Yq*RT_+Ritd=s1eMXchp_%MGSw_^xh{QC&P@4^rK
z8^Wi;d%^<W5}HCmcuKGdQ$j@W@Ha@zBtO52fh}M?oL7%1b+uk6S;#{Si~(!9GFqiU
zvTV#%RS6l8fHB>(b+zUf85jZD9Or7<Y}Gf&Ko~5hqpH@*d2==ICdLs2(|NmMo_+>4
zgWdFbj^wjBwc#FMAP6?ol}R_$oK~9~ZhM~l<IpY{rz!jkZ{l^#;8pw$S4o=7q-fvc
zKKus1#82=E{FoGB3HRVTc!CsT8ehlP@F-TWi7#LS50X^>79uPSV3iHaN`__phNXRm
zwRjoY0UqPi?l!D#xZPMemby>0oT4xwT;fK#^NydaU)y&$!`318Y341)N>}-1ULt}I
zsGrFN+Ue4#AA)?+b`x&6;&FJDZls?tsdqioyE^r6iy*P)nd@h>FwyaqAZF<tnu0S9
z8|83?LU6S6Xa(BPx%3!B`X`-TO0+yeIY+pezNq6F`$sm1^@`QUuClwCCHk;sMR4;P
z5s=5SVp#GxyB6N1#G$oc|FZy-Rx_MOUo3#6V-fDrwIU3yZDOIx3?`jjnE79_(MdL+
z4O-*Y^=(j#uDxU%+goB%R|;^vvo{5NA46te(o+R^k#3D9^y>v!g1Ej|gsl+JzbnF%
zdb$jL-Ccqm`pYHwRZo>bwuJiHkh&$Etcs+at1==jbK7*=7Z4Mj6V3sy%YDV2;$Goq
zxNQXIt9|qL$}9z2#x`91sdPm)ZlJslLRcc2vG{*T=;_w!kPSS%ej=8FclhY3Ojvwm
zb|loJWq!8Wn>XPZ^%6mN{NMESM0bD+cv#92jBOyQCnJc-=3hy6ll3--*C1PCtS2JF
t5MeGbOeDd`M(BE?+Z1;8UxasQ(LA#?<0UUoyFYaeJGWK<9zU59{{bz9k_Z3*

delta 512
zcmY+AF=!KU6vqGW?wVY3$^T1QF_E-3r5&2ukOVsv6q{1B6q+Jhid4-t7*R>uQ?DQn
za#=ccNW9^yg9TA3f}lC@1S^Ut3QC1qR9qSmML{SE;v(pEaPWQa4euL%AAE-4Gn#TO
z7S1rny50LX*?RwO%G_0#Aa4u0CIW+|H`Hl&#ajdRVEY?US;tL0f`uw7c37Q+SxKD`
zqiuruHkBYW(o%dN%3}<h_<(1)gGCt7a1^81g9IWV{)NBh5BV}Txxr8KLwtm%c+5@s
z7_?)@zMdI~LTC7mU-*G<_>86tTE{A0;0ac6&qdzCbzF79m#~0&7k>e|-Id-8Ti>Xu
zeL+!U=;3Qhukyh6&hu0r3heT1Z#gVomOP@iC1HXV*?X3&4@azAmQFdd`)NWjMX};&
zBed-6qm@V^LGwv{x>znv&*>)%bLUED3x(P8@&7-+dAlVlZTWUu*2!7RQ!1QvduwBP
z2APiq4dse|(|^QQlb?H+JTE;x(s?N-E{Nm8ePIXt#Paoe+}S7+_e<4Khu8XEri<2U
zky?Gd?cPWsN!0_^kV^Y3r$Qx)SsgRfPdlyA89L}>hbbdC@iA%;`E64FbY9a!?lv?j
eBt`>MmiIAb++w=}&eSWqAvRPc<S0%0IsO+7K9gAh

diff --git a/server/server/views.py b/server/server/views.py
index f0cc65280..674a44930 100644
--- a/server/server/views.py
+++ b/server/server/views.py
@@ -55,7 +55,13 @@ class Meta:
 
     serialized_form = {
         'errors': form.errors,
-        'fields': [simplejson.loads(str(field)) for field in form],
+        'fields': [
+            {
+                **simplejson.loads(str(field)),
+                'name': field.name,
+                'label': field.label,
+            } for field in form
+        ],
     }
 
     response = JSXResponse(