diff --git a/docs/building-a-form/available-form-features-and-usage-guidelines.md b/docs/building-a-form/available-form-features-and-usage-guidelines.md
index e714e8d..45249de 100644
--- a/docs/building-a-form/available-form-features-and-usage-guidelines.md
+++ b/docs/building-a-form/available-form-features-and-usage-guidelines.md
@@ -419,7 +419,17 @@ For the code implementation, see the [`review` folder](../../src/js/review).
### Required checkbox before form submission
-Use this feature to require a user to indicate they have read terms and conditions, a privacy policy, or any other text before submitting your form. This includes a checkbox and short-form text that can include relevant links to more verbose text on separate pages on your site.
+Use this feature to require a user to indicate they have read terms and conditions, a privacy policy, or any other text before submitting your form. It includes a checkbox and short-form text that can include relevant links to more verbose information on separate pages on your site. To configure this feature, place a `preSubmitInfo` object in the `formConfig`:
+
+```js
+preSubmitInfo: {
+ notice: 'Note: According to federal law, there are criminal penalties, including a fine and/or imprisonment for up to 5 years, for withholding information or for providing incorrect information. (See 18 U.S.C. 1001)
',
+ required: true, // when false, the notice is shown without a checkbox
+ field: 'privacyAgreementAccepted', // name of the field in submitted data
+ label: 'I have read and accept the privacy policy.',
+ error: 'You must accept the privacy policy before continuing',
+}
+```
diff --git a/lib/js/actions.js b/lib/js/actions.js
index d6f6dde..0e6ef56 100644
--- a/lib/js/actions.js
+++ b/lib/js/actions.js
@@ -3,13 +3,13 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.CLOSE_REVIEW_CHAPTER = exports.OPEN_REVIEW_CHAPTER = exports.SET_SUBMITTED = exports.SET_SUBMISSION = exports.SET_PRIVACY_AGREEMENT = exports.SET_VIEWED_PAGES = exports.SET_DATA = exports.SET_EDIT_MODE = undefined;
+exports.CLOSE_REVIEW_CHAPTER = exports.OPEN_REVIEW_CHAPTER = exports.SET_SUBMITTED = exports.SET_SUBMISSION = exports.SET_PRE_SUBMIT = exports.SET_VIEWED_PAGES = exports.SET_DATA = exports.SET_EDIT_MODE = undefined;
exports.closeReviewChapter = closeReviewChapter;
exports.openReviewChapter = openReviewChapter;
exports.setData = setData;
exports.setEditMode = setEditMode;
exports.setSubmission = setSubmission;
-exports.setPrivacyAgreement = setPrivacyAgreement;
+exports.setPreSubmit = setPreSubmit;
exports.setSubmitted = setSubmitted;
exports.setViewedPages = setViewedPages;
exports.submitForm = submitForm;
@@ -36,7 +36,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
var SET_EDIT_MODE = exports.SET_EDIT_MODE = 'SET_EDIT_MODE';
var SET_DATA = exports.SET_DATA = 'SET_DATA';
var SET_VIEWED_PAGES = exports.SET_VIEWED_PAGES = 'SET_VIEWED_PAGES';
-var SET_PRIVACY_AGREEMENT = exports.SET_PRIVACY_AGREEMENT = 'SET_PRIVACY_AGREEMENT';
+var SET_PRE_SUBMIT = exports.SET_PRE_SUBMIT = 'SET_PRE_SUBMIT';
var SET_SUBMISSION = exports.SET_SUBMISSION = 'SET_SUBMISSION';
var SET_SUBMITTED = exports.SET_SUBMITTED = 'SET_SUBMITTED';
var OPEN_REVIEW_CHAPTER = exports.OPEN_REVIEW_CHAPTER = 'OPEN_REVIEW_CHAPTER';
@@ -90,10 +90,11 @@ function setSubmission(field, value) {
};
}
-function setPrivacyAgreement(privacyAgreementAccepted) {
+function setPreSubmit(preSubmitField, preSubmitAccepted) {
return {
- type: SET_PRIVACY_AGREEMENT,
- privacyAgreementAccepted: privacyAgreementAccepted
+ type: SET_PRE_SUBMIT,
+ preSubmitField: preSubmitField,
+ preSubmitAccepted: preSubmitAccepted
};
}
diff --git a/lib/js/actions.js.map b/lib/js/actions.js.map
index d68b655..a672268 100644
--- a/lib/js/actions.js.map
+++ b/lib/js/actions.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../src/js/actions.js"],"names":["closeReviewChapter","openReviewChapter","setData","setEditMode","setSubmission","setPrivacyAgreement","setSubmitted","setViewedPages","submitForm","uploadFile","SET_EDIT_MODE","SET_DATA","SET_VIEWED_PAGES","SET_PRIVACY_AGREEMENT","SET_SUBMISSION","SET_SUBMITTED","OPEN_REVIEW_CHAPTER","CLOSE_REVIEW_CHAPTER","closedChapter","pageKeys","type","openedChapter","data","page","edit","index","field","value","extra","privacyAgreementAccepted","response","submitToUrl","body","submitUrl","trackingPrefix","Promise","resolve","reject","req","XMLHttpRequest","open","addEventListener","status","event","responseBody","responseText","results","JSON","parse","error","Error","statusText","parseInt","getResponseHeader","setRequestHeader","userToken","_","get","window","send","formConfig","form","captureError","errorType","Raven","captureException","fingerprint","message","startsWith","dispatch","promise","submit","transformForSubmit","then","resp","catch","errorReceived","errorMessage","String","file","uiOptions","onProgress","onChange","onError","getState","size","maxSize","name","minSize","fileTypes","some","toLowerCase","endsWith","fileType","uploading","payload","createPayload","formId","fileUploadUrl","fileData","parseResponse","moment","unix","captureMessage","upload","evt","lengthComputable","loaded","total"],"mappings":";;;;;;QAegBA,kB,GAAAA,kB;QAQAC,iB,GAAAA,iB;QAOAC,O,GAAAA,O;QAOAC,W,GAAAA,W;QAWAC,a,GAAAA,a;QASAC,mB,GAAAA,mB;QAOAC,Y,GAAAA,Y;QAQAC,c,GAAAA,c;QA+DAC,U,GAAAA,U;QAiDAC,U,GAAAA,U;;AAxLhB;;;;AACA;;;;AACA;;;;AACA;;AACA;;;;AAEO,IAAMC,wCAAgB,eAAtB;AACA,IAAMC,8BAAW,UAAjB;AACA,IAAMC,8CAAmB,kBAAzB;AACA,IAAMC,wDAAwB,uBAA9B;AACA,IAAMC,0CAAiB,gBAAvB;AACA,IAAMC,wCAAgB,eAAtB;AACA,IAAMC,oDAAsB,qBAA5B;AACA,IAAMC,sDAAuB,sBAA7B;;AAEA,SAASjB,kBAAT,CAA4BkB,aAA5B,EAA0D;AAAA,MAAfC,QAAe,uEAAJ,EAAI;;AAC/D,SAAO;AACLC,UAAMH,oBADD;AAELC,gCAFK;AAGLC;AAHK,GAAP;AAKD;;AAEM,SAASlB,iBAAT,CAA2BoB,aAA3B,EAA0C;AAC/C,SAAO;AACLD,UAAMJ,mBADD;AAELK;AAFK,GAAP;AAID;;AAEM,SAASnB,OAAT,CAAiBoB,IAAjB,EAAuB;AAC5B,SAAO;AACLF,UAAMT,QADD;AAELW;AAFK,GAAP;AAID;;AAEM,SAASnB,WAAT,CAAqBoB,IAArB,EAA2BC,IAA3B,EAA+C;AAAA,MAAdC,KAAc,uEAAN,IAAM;;AACpD,SAAO;AACLL,UAAMV,aADD;AAELc,cAFK;AAGLD,cAHK;AAILE;AAJK,GAAP;AAMD;;AAED;AACA;AACO,SAASrB,aAAT,CAAuBsB,KAAvB,EAA8BC,KAA9B,EAAmD;AAAA,MAAdC,KAAc,uEAAN,IAAM;;AACxD,SAAO;AACLR,UAAMN,cADD;AAELY,gBAFK;AAGLC,gBAHK;AAILC;AAJK,GAAP;AAMD;;AAEM,SAASvB,mBAAT,CAA6BwB,wBAA7B,EAAuD;AAC5D,SAAO;AACLT,UAAMP,qBADD;AAELgB;AAFK,GAAP;AAID;;AAEM,SAASvB,YAAT,CAAsBwB,QAAtB,EAAgC;AACrC,SAAO;AACLV,UAAML,aADD;AAELe,cAAU,OAAOA,SAASR,IAAhB,KAAyB,WAAzB,GAAuCQ,SAASR,IAAhD,GAAuDQ;AAF5D,GAAP;AAID;;AAGM,SAASvB,cAAT,CAAwBY,QAAxB,EAAkC;AACvC,SAAO;AACLC,UAAMR,gBADD;AAELO;AAFK,GAAP;AAID;;AAED,SAASY,WAAT,CAAqBC,IAArB,EAA2BC,SAA3B,EAAsCC,cAAtC,EAAsD;AACpD,SAAO,IAAIC,OAAJ,CAAY,UAACC,OAAD,EAAUC,MAAV,EAAqB;AACtC,QAAMC,MAAM,IAAIC,cAAJ,EAAZ;AACAD,QAAIE,IAAJ,CAAS,MAAT,EAAiBP,SAAjB;AACAK,QAAIG,gBAAJ,CAAqB,MAArB,EAA6B,YAAM;AACjC,UAAIH,IAAII,MAAJ,IAAc,GAAd,IAAqBJ,IAAII,MAAJ,GAAa,GAAtC,EAA2C;AACzC,kCAAY;AACVC,iBAAUT,cAAV;AADU,SAAZ;AAGA;AACA,YAAMU,eAAe,cAAcN,GAAd,GAAoBA,IAAIR,QAAxB,GAAmCQ,IAAIO,YAA5D;AACA,YAAMC,UAAUC,KAAKC,KAAL,CAAWJ,YAAX,CAAhB;AACAR,gBAAQU,OAAR;AACD,OARD,MAQO;AACL,YAAIG,cAAJ;AACA,YAAIX,IAAII,MAAJ,KAAe,GAAnB,EAAwB;AACtBO,kBAAQ,IAAIC,KAAJ,4BAAmCZ,IAAIa,UAAvC,CAAR;AACAF,gBAAMrB,KAAN,GAAcwB,SAASd,IAAIe,iBAAJ,CAAsB,mBAAtB,CAAT,EAAqD,EAArD,CAAd;AACD,SAHD,MAGO;AACLJ,kBAAQ,IAAIC,KAAJ,yBAAgCZ,IAAIa,UAApC,CAAR;AACD;AACDF,cAAME,UAAN,GAAmBb,IAAIa,UAAvB;AACAd,eAAOY,KAAP;AACD;AACF,KApBD;;AAsBAX,QAAIG,gBAAJ,CAAqB,OAArB,EAA8B,YAAM;AAClC,UAAMQ,QAAQ,IAAIC,KAAJ,CAAU,2CAAV,CAAd;AACAD,YAAME,UAAN,GAAmBb,IAAIa,UAAvB;AACAd,aAAOY,KAAP;AACD,KAJD;;AAMAX,QAAIG,gBAAJ,CAAqB,OAArB,EAA8B,YAAM;AAClC,UAAMQ,QAAQ,IAAIC,KAAJ,CAAU,oCAAV,CAAd;AACAD,YAAME,UAAN,GAAmBb,IAAIa,UAAvB;AACAd,aAAOY,KAAP;AACD,KAJD;;AAMAX,QAAIG,gBAAJ,CAAqB,SAArB,EAAgC,YAAM;AACpC,UAAMQ,QAAQ,IAAIC,KAAJ,CAAU,sCAAV,CAAd;AACAD,YAAME,UAAN,GAAmBb,IAAIa,UAAvB;AACAd,aAAOY,KAAP;AACD,KAJD;;AAMAX,QAAIgB,gBAAJ,CAAqB,kBAArB,EAAyC,OAAzC;AACAhB,QAAIgB,gBAAJ,CAAqB,cAArB,EAAqC,kBAArC;;AAEA,QAAMC,YAAYC,eAAEC,GAAF,CAAM,0BAAN,EAAkCC,MAAlC,CAAlB;AACA,QAAIH,SAAJ,EAAe;AACbjB,UAAIgB,gBAAJ,CAAqB,eAArB,mBAAqDC,SAArD;AACD;;AAEDjB,QAAIqB,IAAJ,CAAS3B,IAAT;AACD,GApDM,CAAP;AAqDD;;AAEM,SAASxB,UAAT,CAAoBoD,UAApB,EAAgCC,IAAhC,EAAsC;AAC3C,MAAMC,eAAe,SAAfA,YAAe,CAACb,KAAD,EAAQc,SAAR,EAAsB;AACzCC,sBAAMC,gBAAN,CAAuBhB,KAAvB,EAA8B;AAC5BiB,mBAAa,CAACN,WAAW1B,cAAZ,EAA4Be,MAAMkB,OAAlC,CADe;AAE5BvC,aAAO;AACLmC,4BADK;AAELZ,oBAAYF,MAAME;AAFb;AAFqB,KAA9B;AAOA,8BAAY;AACVR,aAAUiB,WAAW1B,cAArB,2BAAwD6B,UAAUK,UAAV,CAAqB,QAArB,IAAiC,SAAjC,GAA6C,EAArG;AADU,KAAZ;AAGD,GAXD;;AAaA,SAAO,oBAAY;AACjBC,aAASjE,cAAc,QAAd,EAAwB,eAAxB,CAAT;AACA,8BAAY;AACVuC,aAAUiB,WAAW1B,cAArB;AADU,KAAZ;;AAIA,QAAIoC,gBAAJ;AACA,QAAIV,WAAWW,MAAf,EAAuB;AACrBD,gBAAUV,WAAWW,MAAX,CAAkBV,IAAlB,EAAwBD,UAAxB,CAAV;AACD,KAFD,MAEO;AACL,UAAM5B,OAAO4B,WAAWY,kBAAX,GACTZ,WAAWY,kBAAX,CAA8BZ,UAA9B,EAA0CC,IAA1C,CADS,GAET,iCAAmBD,UAAnB,EAA+BC,IAA/B,CAFJ;;AAIAS,gBAAUvC,YAAYC,IAAZ,EAAkB4B,WAAW3B,SAA7B,EAAwC2B,WAAW1B,cAAnD,CAAV;AACD;;AAED,WAAOoC,QACJG,IADI,CACC;AAAA,aAAQJ,SAAS/D,aAAaoE,IAAb,CAAT,CAAR;AAAA,KADD,EAEJC,KAFI,CAEE,yBAAiB;AACtB;AACA,UAAM1B,QAAQ2B,yBAAyB1B,KAAzB,GAAiC0B,aAAjC,GAAiD,IAAI1B,KAAJ,CAAU0B,aAAV,CAA/D;AACA,UAAMC,eAAeC,OAAO7B,MAAMkB,OAAb,CAArB;AACA,UAAIJ,YAAY,aAAhB;AACA,UAAIc,aAAaT,UAAb,CAAwB,sBAAxB,CAAJ,EAAqD;AACnDL,oBAAY,gBAAZ;AACD,OAFD,MAEO,IAAIc,aAAaT,UAAb,CAAwB,mBAAxB,CAAJ,EAAkD;AACvDL,oBAAY,aAAZ;AACD;AACDD,mBAAab,KAAb,EAAoBc,SAApB;AACAM,eAASjE,cAAc,QAAd,EAAwB2D,SAAxB,EAAmCd,MAAMrB,KAAzC,CAAT;AACD,KAdI,CAAP;AAeD,GAhCD;AAiCD;;AAEM,SAASnB,UAAT,CAAoBsE,IAApB,EAA0BC,SAA1B,EAAqCC,UAArC,EAAiDC,QAAjD,EAA2DC,OAA3D,EAAoE;AACzE,SAAO,UAACd,QAAD,EAAWe,QAAX,EAAwB;AAC7B,QAAIL,KAAKM,IAAL,GAAYL,UAAUM,OAA1B,EAAmC;AACjCJ,eAAS;AACPK,cAAMR,KAAKQ,IADJ;AAEPV,sBAAc;AAFP,OAAT;;AAKAM;AACA,aAAO,IAAP;AACD;;AAED,QAAIJ,KAAKM,IAAL,GAAYL,UAAUQ,OAA1B,EAAmC;AACjCN,eAAS;AACPK,cAAMR,KAAKQ,IADJ;AAEPV,sBAAc;AAFP,OAAT;;AAKAM;AACA,aAAO,IAAP;AACD;;AAED;AACA;AACA,QAAI,CAACH,UAAUS,SAAV,CAAoBC,IAApB,CAAyB;AAAA,aAAYX,KAAKQ,IAAL,CAAUI,WAAV,GAAwBC,QAAxB,CAAiCC,SAASF,WAAT,EAAjC,CAAZ;AAAA,KAAzB,CAAL,EAAqG;AACnGT,eAAS;AACPK,cAAMR,KAAKQ,IADJ;AAEPV,sBAAc;AAFP,OAAT;;AAKAM;AACA,aAAO,IAAP;AACD;;AAEDD,aAAS;AACPK,YAAMR,KAAKQ,IADJ;AAEPO,iBAAW;AAFJ,KAAT;;AAKA,QAAMC,UAAUf,UAAUgB,aAAV,CAAwBjB,IAAxB,EAA8BK,WAAWvB,IAAX,CAAgBoC,MAA9C,CAAhB;;AAEA,QAAM3D,MAAM,IAAIC,cAAJ,EAAZ;;AAEAD,QAAIE,IAAJ,CAAS,MAAT,EAAiBwC,UAAUkB,aAA3B;AACA5D,QAAIG,gBAAJ,CAAqB,MAArB,EAA6B,YAAM;AACjC,UAAIH,IAAII,MAAJ,IAAc,GAAd,IAAqBJ,IAAII,MAAJ,GAAa,GAAtC,EAA2C;AACzC,YAAMV,OAAO,cAAcM,GAAd,GAAoBA,IAAIR,QAAxB,GAAmCQ,IAAIO,YAApD;AACA,YAAMsD,WAAWnB,UAAUoB,aAAV,CAAwBrD,KAAKC,KAAL,CAAWhB,IAAX,CAAxB,EAA0C+C,IAA1C,CAAjB;AACAG,iBAASiB,QAAT;AACD,OAJD,MAIO;AACL,YAAItB,eAAevC,IAAIa,UAAvB;AACA,YAAIb,IAAII,MAAJ,KAAe,GAAnB,EAAwB;AACtBmC,0IAAyH,uBAAYwB,iBAAOC,IAAP,CAAYlD,SAASd,IAAIe,iBAAJ,CAAsB,mBAAtB,CAAT,EAAqD,EAArD,CAAZ,CAAZ,CAAzH;AACD;;AAED6B,iBAAS;AACPK,gBAAMR,KAAKQ,IADJ;AAEPV;AAFO,SAAT;AAIAb,0BAAMuC,cAAN,yBAA2CjE,IAAIa,UAA/C;AACAgC;AACD;AACF,KAlBD;;AAoBA7C,QAAIG,gBAAJ,CAAqB,OAArB,EAA8B,YAAM;AAClC,UAAMoC,eAAe,wBAArB;AACAK,eAAS;AACPK,cAAMR,KAAKQ,IADJ;AAEPV;AAFO,OAAT;AAIAb,wBAAMuC,cAAN,yBAA2C1B,YAA3C,EAA2D;AACzDjD,eAAO;AACLuB,sBAAYb,IAAIa;AADX;AADkD,OAA3D;AAKAgC;AACD,KAZD;;AAcA7C,QAAIkE,MAAJ,CAAW/D,gBAAX,CAA4B,UAA5B,EAAwC,UAACgE,GAAD,EAAS;AAC/C,UAAIA,IAAIC,gBAAJ,IAAwBzB,UAA5B,EAAwC;AACtC;AACA;AACAA,mBAAYwB,IAAIE,MAAJ,GAAaF,IAAIG,KAAlB,GAA2B,EAAtC;AACD;AACF,KAND;;AAQAtE,QAAIgB,gBAAJ,CAAqB,kBAArB,EAAyC,OAAzC;AACAhB,QAAIqB,IAAJ,CAASoC,OAAT;;AAEA,WAAOzD,GAAP;AACD,GAzFD;AA0FD","file":"actions.js","sourcesContent":["import Raven from 'raven-js';\nimport moment from 'moment';\nimport _ from './utilities/data';\nimport { transformForSubmit, recordEvent } from './helpers';\nimport { timeFromNow } from './utilities/date';\n\nexport const SET_EDIT_MODE = 'SET_EDIT_MODE';\nexport const SET_DATA = 'SET_DATA';\nexport const SET_VIEWED_PAGES = 'SET_VIEWED_PAGES';\nexport const SET_PRIVACY_AGREEMENT = 'SET_PRIVACY_AGREEMENT';\nexport const SET_SUBMISSION = 'SET_SUBMISSION';\nexport const SET_SUBMITTED = 'SET_SUBMITTED';\nexport const OPEN_REVIEW_CHAPTER = 'OPEN_REVIEW_CHAPTER';\nexport const CLOSE_REVIEW_CHAPTER = 'CLOSE_REVIEW_CHAPTER';\n\nexport function closeReviewChapter(closedChapter, pageKeys = []) {\n return {\n type: CLOSE_REVIEW_CHAPTER,\n closedChapter,\n pageKeys\n };\n}\n\nexport function openReviewChapter(openedChapter) {\n return {\n type: OPEN_REVIEW_CHAPTER,\n openedChapter\n };\n}\n\nexport function setData(data) {\n return {\n type: SET_DATA,\n data\n };\n}\n\nexport function setEditMode(page, edit, index = null) {\n return {\n type: SET_EDIT_MODE,\n edit,\n page,\n index\n };\n}\n\n// extra is used to pass other information (from a submission error or anything else)\n// into the submission state object\nexport function setSubmission(field, value, extra = null) {\n return {\n type: SET_SUBMISSION,\n field,\n value,\n extra\n };\n}\n\nexport function setPrivacyAgreement(privacyAgreementAccepted) {\n return {\n type: SET_PRIVACY_AGREEMENT,\n privacyAgreementAccepted\n };\n}\n\nexport function setSubmitted(response) {\n return {\n type: SET_SUBMITTED,\n response: typeof response.data !== 'undefined' ? response.data : response\n };\n}\n\n\nexport function setViewedPages(pageKeys) {\n return {\n type: SET_VIEWED_PAGES,\n pageKeys\n };\n}\n\nfunction submitToUrl(body, submitUrl, trackingPrefix) {\n return new Promise((resolve, reject) => {\n const req = new XMLHttpRequest();\n req.open('POST', submitUrl);\n req.addEventListener('load', () => {\n if (req.status >= 200 && req.status < 300) {\n recordEvent({\n event: `${trackingPrefix}-submission-successful`,\n });\n // got this from the fetch polyfill, keeping it to be safe\n const responseBody = 'response' in req ? req.response : req.responseText;\n const results = JSON.parse(responseBody);\n resolve(results);\n } else {\n let error;\n if (req.status === 429) {\n error = new Error(`vets_throttled_error: ${req.statusText}`);\n error.extra = parseInt(req.getResponseHeader('x-ratelimit-reset'), 10);\n } else {\n error = new Error(`vets_server_error: ${req.statusText}`);\n }\n error.statusText = req.statusText;\n reject(error);\n }\n });\n\n req.addEventListener('error', () => {\n const error = new Error('vets_client_error: Network request failed');\n error.statusText = req.statusText;\n reject(error);\n });\n\n req.addEventListener('abort', () => {\n const error = new Error('vets_client_error: Request aborted');\n error.statusText = req.statusText;\n reject(error);\n });\n\n req.addEventListener('timeout', () => {\n const error = new Error('vets_client_error: Request timed out');\n error.statusText = req.statusText;\n reject(error);\n });\n\n req.setRequestHeader('X-Key-Inflection', 'camel');\n req.setRequestHeader('Content-Type', 'application/json');\n\n const userToken = _.get('sessionStorage.userToken', window);\n if (userToken) {\n req.setRequestHeader('Authorization', `Token token=${userToken}`);\n }\n\n req.send(body);\n });\n}\n\nexport function submitForm(formConfig, form) {\n const captureError = (error, errorType) => {\n Raven.captureException(error, {\n fingerprint: [formConfig.trackingPrefix, error.message],\n extra: {\n errorType,\n statusText: error.statusText\n }\n });\n recordEvent({\n event: `${formConfig.trackingPrefix}-submission-failed${errorType.startsWith('client') ? '-client' : ''}`,\n });\n };\n\n return dispatch => {\n dispatch(setSubmission('status', 'submitPending'));\n recordEvent({\n event: `${formConfig.trackingPrefix}-submission`,\n });\n\n let promise;\n if (formConfig.submit) {\n promise = formConfig.submit(form, formConfig);\n } else {\n const body = formConfig.transformForSubmit\n ? formConfig.transformForSubmit(formConfig, form)\n : transformForSubmit(formConfig, form);\n\n promise = submitToUrl(body, formConfig.submitUrl, formConfig.trackingPrefix);\n }\n\n return promise\n .then(resp => dispatch(setSubmitted(resp)))\n .catch(errorReceived => {\n // overly cautious\n const error = errorReceived instanceof Error ? errorReceived : new Error(errorReceived);\n const errorMessage = String(error.message);\n let errorType = 'clientError';\n if (errorMessage.startsWith('vets_throttled_error')) {\n errorType = 'throttledError';\n } else if (errorMessage.startsWith('vets_server_error')) {\n errorType = 'serverError';\n }\n captureError(error, errorType);\n dispatch(setSubmission('status', errorType, error.extra));\n });\n };\n}\n\nexport function uploadFile(file, uiOptions, onProgress, onChange, onError) {\n return (dispatch, getState) => {\n if (file.size > uiOptions.maxSize) {\n onChange({\n name: file.name,\n errorMessage: 'File is too large to be uploaded'\n });\n\n onError();\n return null;\n }\n\n if (file.size < uiOptions.minSize) {\n onChange({\n name: file.name,\n errorMessage: 'File is too small to be uploaded'\n });\n\n onError();\n return null;\n }\n\n // we limit file types, but it’s not respected on mobile and desktop\n // users can bypass it without much effort\n if (!uiOptions.fileTypes.some(fileType => file.name.toLowerCase().endsWith(fileType.toLowerCase()))) {\n onChange({\n name: file.name,\n errorMessage: 'File is not one of the allowed types'\n });\n\n onError();\n return null;\n }\n\n onChange({\n name: file.name,\n uploading: true\n });\n\n const payload = uiOptions.createPayload(file, getState().form.formId);\n\n const req = new XMLHttpRequest();\n\n req.open('POST', uiOptions.fileUploadUrl);\n req.addEventListener('load', () => {\n if (req.status >= 200 && req.status < 300) {\n const body = 'response' in req ? req.response : req.responseText;\n const fileData = uiOptions.parseResponse(JSON.parse(body), file);\n onChange(fileData);\n } else {\n let errorMessage = req.statusText;\n if (req.status === 429) {\n errorMessage = `You’ve reached the limit for the number of submissions we can accept at this time. Please try again in ${timeFromNow(moment.unix(parseInt(req.getResponseHeader('x-ratelimit-reset'), 10)))}.`;\n }\n\n onChange({\n name: file.name,\n errorMessage\n });\n Raven.captureMessage(`vets_upload_error: ${req.statusText}`);\n onError();\n }\n });\n\n req.addEventListener('error', () => {\n const errorMessage = 'Network request failed';\n onChange({\n name: file.name,\n errorMessage\n });\n Raven.captureMessage(`vets_upload_error: ${errorMessage}`, {\n extra: {\n statusText: req.statusText\n }\n });\n onError();\n });\n\n req.upload.addEventListener('progress', (evt) => {\n if (evt.lengthComputable && onProgress) {\n // setting this at 80, because there's some time after we get to 100%\n // where the backend is uploading to s3\n onProgress((evt.loaded / evt.total) * 80);\n }\n });\n\n req.setRequestHeader('X-Key-Inflection', 'camel');\n req.send(payload);\n\n return req;\n };\n}\n"]}
\ No newline at end of file
+{"version":3,"sources":["../../src/js/actions.js"],"names":["closeReviewChapter","openReviewChapter","setData","setEditMode","setSubmission","setPreSubmit","setSubmitted","setViewedPages","submitForm","uploadFile","SET_EDIT_MODE","SET_DATA","SET_VIEWED_PAGES","SET_PRE_SUBMIT","SET_SUBMISSION","SET_SUBMITTED","OPEN_REVIEW_CHAPTER","CLOSE_REVIEW_CHAPTER","closedChapter","pageKeys","type","openedChapter","data","page","edit","index","field","value","extra","preSubmitField","preSubmitAccepted","response","submitToUrl","body","submitUrl","trackingPrefix","Promise","resolve","reject","req","XMLHttpRequest","open","addEventListener","status","event","responseBody","responseText","results","JSON","parse","error","Error","statusText","parseInt","getResponseHeader","setRequestHeader","userToken","_","get","window","send","formConfig","form","captureError","errorType","Raven","captureException","fingerprint","message","startsWith","dispatch","promise","submit","transformForSubmit","then","resp","catch","errorReceived","errorMessage","String","file","uiOptions","onProgress","onChange","onError","getState","size","maxSize","name","minSize","fileTypes","some","toLowerCase","endsWith","fileType","uploading","payload","createPayload","formId","fileUploadUrl","fileData","parseResponse","moment","unix","captureMessage","upload","evt","lengthComputable","loaded","total"],"mappings":"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","file":"actions.js","sourcesContent":["import Raven from 'raven-js';\nimport moment from 'moment';\nimport _ from './utilities/data';\nimport { transformForSubmit, recordEvent } from './helpers';\nimport { timeFromNow } from './utilities/date';\n\nexport const SET_EDIT_MODE = 'SET_EDIT_MODE';\nexport const SET_DATA = 'SET_DATA';\nexport const SET_VIEWED_PAGES = 'SET_VIEWED_PAGES';\nexport const SET_PRE_SUBMIT = 'SET_PRE_SUBMIT';\nexport const SET_SUBMISSION = 'SET_SUBMISSION';\nexport const SET_SUBMITTED = 'SET_SUBMITTED';\nexport const OPEN_REVIEW_CHAPTER = 'OPEN_REVIEW_CHAPTER';\nexport const CLOSE_REVIEW_CHAPTER = 'CLOSE_REVIEW_CHAPTER';\n\nexport function closeReviewChapter(closedChapter, pageKeys = []) {\n return {\n type: CLOSE_REVIEW_CHAPTER,\n closedChapter,\n pageKeys\n };\n}\n\nexport function openReviewChapter(openedChapter) {\n return {\n type: OPEN_REVIEW_CHAPTER,\n openedChapter\n };\n}\n\nexport function setData(data) {\n return {\n type: SET_DATA,\n data\n };\n}\n\nexport function setEditMode(page, edit, index = null) {\n return {\n type: SET_EDIT_MODE,\n edit,\n page,\n index\n };\n}\n\n// extra is used to pass other information (from a submission error or anything else)\n// into the submission state object\nexport function setSubmission(field, value, extra = null) {\n return {\n type: SET_SUBMISSION,\n field,\n value,\n extra\n };\n}\n\nexport function setPreSubmit(preSubmitField, preSubmitAccepted) {\n return {\n type: SET_PRE_SUBMIT,\n preSubmitField,\n preSubmitAccepted\n };\n}\n\nexport function setSubmitted(response) {\n return {\n type: SET_SUBMITTED,\n response: typeof response.data !== 'undefined' ? response.data : response\n };\n}\n\n\nexport function setViewedPages(pageKeys) {\n return {\n type: SET_VIEWED_PAGES,\n pageKeys\n };\n}\n\nfunction submitToUrl(body, submitUrl, trackingPrefix) {\n return new Promise((resolve, reject) => {\n const req = new XMLHttpRequest();\n req.open('POST', submitUrl);\n req.addEventListener('load', () => {\n if (req.status >= 200 && req.status < 300) {\n recordEvent({\n event: `${trackingPrefix}-submission-successful`,\n });\n // got this from the fetch polyfill, keeping it to be safe\n const responseBody = 'response' in req ? req.response : req.responseText;\n const results = JSON.parse(responseBody);\n resolve(results);\n } else {\n let error;\n if (req.status === 429) {\n error = new Error(`vets_throttled_error: ${req.statusText}`);\n error.extra = parseInt(req.getResponseHeader('x-ratelimit-reset'), 10);\n } else {\n error = new Error(`vets_server_error: ${req.statusText}`);\n }\n error.statusText = req.statusText;\n reject(error);\n }\n });\n\n req.addEventListener('error', () => {\n const error = new Error('vets_client_error: Network request failed');\n error.statusText = req.statusText;\n reject(error);\n });\n\n req.addEventListener('abort', () => {\n const error = new Error('vets_client_error: Request aborted');\n error.statusText = req.statusText;\n reject(error);\n });\n\n req.addEventListener('timeout', () => {\n const error = new Error('vets_client_error: Request timed out');\n error.statusText = req.statusText;\n reject(error);\n });\n\n req.setRequestHeader('X-Key-Inflection', 'camel');\n req.setRequestHeader('Content-Type', 'application/json');\n\n const userToken = _.get('sessionStorage.userToken', window);\n if (userToken) {\n req.setRequestHeader('Authorization', `Token token=${userToken}`);\n }\n\n req.send(body);\n });\n}\n\nexport function submitForm(formConfig, form) {\n const captureError = (error, errorType) => {\n Raven.captureException(error, {\n fingerprint: [formConfig.trackingPrefix, error.message],\n extra: {\n errorType,\n statusText: error.statusText\n }\n });\n recordEvent({\n event: `${formConfig.trackingPrefix}-submission-failed${errorType.startsWith('client') ? '-client' : ''}`,\n });\n };\n\n return dispatch => {\n dispatch(setSubmission('status', 'submitPending'));\n recordEvent({\n event: `${formConfig.trackingPrefix}-submission`,\n });\n\n let promise;\n if (formConfig.submit) {\n promise = formConfig.submit(form, formConfig);\n } else {\n const body = formConfig.transformForSubmit\n ? formConfig.transformForSubmit(formConfig, form)\n : transformForSubmit(formConfig, form);\n\n promise = submitToUrl(body, formConfig.submitUrl, formConfig.trackingPrefix);\n }\n\n return promise\n .then(resp => dispatch(setSubmitted(resp)))\n .catch(errorReceived => {\n // overly cautious\n const error = errorReceived instanceof Error ? errorReceived : new Error(errorReceived);\n const errorMessage = String(error.message);\n let errorType = 'clientError';\n if (errorMessage.startsWith('vets_throttled_error')) {\n errorType = 'throttledError';\n } else if (errorMessage.startsWith('vets_server_error')) {\n errorType = 'serverError';\n }\n captureError(error, errorType);\n dispatch(setSubmission('status', errorType, error.extra));\n });\n };\n}\n\nexport function uploadFile(file, uiOptions, onProgress, onChange, onError) {\n return (dispatch, getState) => {\n if (file.size > uiOptions.maxSize) {\n onChange({\n name: file.name,\n errorMessage: 'File is too large to be uploaded'\n });\n\n onError();\n return null;\n }\n\n if (file.size < uiOptions.minSize) {\n onChange({\n name: file.name,\n errorMessage: 'File is too small to be uploaded'\n });\n\n onError();\n return null;\n }\n\n // we limit file types, but it’s not respected on mobile and desktop\n // users can bypass it without much effort\n if (!uiOptions.fileTypes.some(fileType => file.name.toLowerCase().endsWith(fileType.toLowerCase()))) {\n onChange({\n name: file.name,\n errorMessage: 'File is not one of the allowed types'\n });\n\n onError();\n return null;\n }\n\n onChange({\n name: file.name,\n uploading: true\n });\n\n const payload = uiOptions.createPayload(file, getState().form.formId);\n\n const req = new XMLHttpRequest();\n\n req.open('POST', uiOptions.fileUploadUrl);\n req.addEventListener('load', () => {\n if (req.status >= 200 && req.status < 300) {\n const body = 'response' in req ? req.response : req.responseText;\n const fileData = uiOptions.parseResponse(JSON.parse(body), file);\n onChange(fileData);\n } else {\n let errorMessage = req.statusText;\n if (req.status === 429) {\n errorMessage = `You’ve reached the limit for the number of submissions we can accept at this time. Please try again in ${timeFromNow(moment.unix(parseInt(req.getResponseHeader('x-ratelimit-reset'), 10)))}.`;\n }\n\n onChange({\n name: file.name,\n errorMessage\n });\n Raven.captureMessage(`vets_upload_error: ${req.statusText}`);\n onError();\n }\n });\n\n req.addEventListener('error', () => {\n const errorMessage = 'Network request failed';\n onChange({\n name: file.name,\n errorMessage\n });\n Raven.captureMessage(`vets_upload_error: ${errorMessage}`, {\n extra: {\n statusText: req.statusText\n }\n });\n onError();\n });\n\n req.upload.addEventListener('progress', (evt) => {\n if (evt.lengthComputable && onProgress) {\n // setting this at 80, because there's some time after we get to 100%\n // where the backend is uploading to s3\n onProgress((evt.loaded / evt.total) * 80);\n }\n });\n\n req.setRequestHeader('X-Key-Inflection', 'camel');\n req.send(payload);\n\n return req;\n };\n}\n"]}
\ No newline at end of file
diff --git a/lib/js/components/PreSubmitSection.js b/lib/js/components/PreSubmitSection.js
new file mode 100644
index 0000000..28abf51
--- /dev/null
+++ b/lib/js/components/PreSubmitSection.js
@@ -0,0 +1,50 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.PreSubmitSection = PreSubmitSection;
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _ErrorableCheckbox = require('./ErrorableCheckbox');
+
+var _ErrorableCheckbox2 = _interopRequireDefault(_ErrorableCheckbox);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function PreSubmitSection(_ref) {
+ var onChange = _ref.onChange,
+ showError = _ref.showError,
+ preSubmitInfo = _ref.preSubmitInfo,
+ form = _ref.form;
+
+ var info = preSubmitInfo || {};
+ var field = info.field || 'AGREED';
+
+ return _react2.default.createElement(
+ 'div',
+ null,
+ info.notice,
+ info.required && _react2.default.createElement(_ErrorableCheckbox2.default, { required: true,
+ checked: form.data[field],
+ onValueChange: onChange,
+ name: field,
+ errorMessage: showError && !form.data[field] ? info.error || 'Please agree before continuing' : undefined,
+ label: info.label })
+ );
+}
+
+PreSubmitSection.propTypes = {
+ form: _propTypes2.default.object.isRequired,
+ onChange: _propTypes2.default.func.isRequired,
+ preSubmitInfo: _propTypes2.default.object,
+ showError: _propTypes2.default.bool
+};
+//# sourceMappingURL=PreSubmitSection.js.map
\ No newline at end of file
diff --git a/lib/js/components/PreSubmitSection.js.map b/lib/js/components/PreSubmitSection.js.map
new file mode 100644
index 0000000..fe521ea
--- /dev/null
+++ b/lib/js/components/PreSubmitSection.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/js/components/PreSubmitSection.jsx"],"names":["PreSubmitSection","onChange","showError","preSubmitInfo","form","info","field","notice","required","data","error","undefined","label","propTypes","PropTypes","object","isRequired","func","bool"],"mappings":";;;;;QAIgBA,gB,GAAAA,gB;;AAJhB;;;;AACA;;;;AACA;;;;;;AAEO,SAASA,gBAAT,OAAwE;AAAA,MAA5CC,QAA4C,QAA5CA,QAA4C;AAAA,MAAlCC,SAAkC,QAAlCA,SAAkC;AAAA,MAAvBC,aAAuB,QAAvBA,aAAuB;AAAA,MAARC,IAAQ,QAARA,IAAQ;;AAC7E,MAAMC,OAAOF,iBAAiB,EAA9B;AACA,MAAMG,QAAQD,KAAKC,KAAL,IAAc,QAA5B;;AAEA,SACE;AAAA;AAAA;AACGD,SAAKE,MADR;AAEGF,SAAKG,QAAL,IACC,8BAAC,2BAAD,IAAmB,cAAnB;AACE,eAASJ,KAAKK,IAAL,CAAUH,KAAV,CADX;AAEE,qBAAeL,QAFjB;AAGE,YAAMK,KAHR;AAIE,oBAAcJ,aAAa,CAACE,KAAKK,IAAL,CAAUH,KAAV,CAAd,GAAkCD,KAAKK,KAAL,IAAc,gCAAhD,GAAoFC,SAJpG;AAKE,aAAON,KAAKO,KALd;AAHJ,GADF;AAaD;;AAEDZ,iBAAiBa,SAAjB,GAA6B;AAC3BT,QAAMU,oBAAUC,MAAV,CAAiBC,UADI;AAE3Bf,YAAUa,oBAAUG,IAAV,CAAeD,UAFE;AAG3Bb,iBAAeW,oBAAUC,MAHE;AAI3Bb,aAAWY,oBAAUI;AAJM,CAA7B","file":"PreSubmitSection.js","sourcesContent":["import PropTypes from 'prop-types';\nimport React from 'react';\nimport ErrorableCheckbox from './ErrorableCheckbox';\n\nexport function PreSubmitSection({ onChange, showError, preSubmitInfo, form }) {\n const info = preSubmitInfo || {};\n const field = info.field || 'AGREED';\n\n return (\n \n {info.notice}\n {info.required &&\n \n }\n
\n );\n}\n\nPreSubmitSection.propTypes = {\n form: PropTypes.object.isRequired,\n onChange: PropTypes.func.isRequired,\n preSubmitInfo: PropTypes.object,\n showError: PropTypes.bool\n};\n"]}
\ No newline at end of file
diff --git a/lib/js/components/PrivacyAgreement.js b/lib/js/components/PrivacyAgreement.js
deleted file mode 100644
index ffa0f45..0000000
--- a/lib/js/components/PrivacyAgreement.js
+++ /dev/null
@@ -1,52 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-exports.default = PrivacyAgreement;
-
-var _propTypes = require('prop-types');
-
-var _propTypes2 = _interopRequireDefault(_propTypes);
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _ErrorableCheckbox = require('./ErrorableCheckbox');
-
-var _ErrorableCheckbox2 = _interopRequireDefault(_ErrorableCheckbox);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function PrivacyAgreement(_ref) {
- var onChange = _ref.onChange,
- checked = _ref.checked,
- showError = _ref.showError;
-
- return _react2.default.createElement(
- 'div',
- null,
- _react2.default.createElement(_ErrorableCheckbox2.default, { required: true,
- checked: checked,
- onValueChange: onChange,
- name: 'privacyAgreement',
- errorMessage: showError && !checked ? 'You must accept the privacy policy before continuing' : undefined,
- label: _react2.default.createElement(
- 'span',
- null,
- 'I have read and accept the ',
- _react2.default.createElement(
- 'a',
- { target: '_blank', href: '/privacy/' },
- 'privacy policy'
- )
- ) })
- );
-}
-
-PrivacyAgreement.propTypes = {
- onChange: _propTypes2.default.func.isRequired,
- checked: _propTypes2.default.bool.isRequired
-};
-//# sourceMappingURL=PrivacyAgreement.js.map
\ No newline at end of file
diff --git a/lib/js/components/PrivacyAgreement.js.map b/lib/js/components/PrivacyAgreement.js.map
deleted file mode 100644
index ea64a2d..0000000
--- a/lib/js/components/PrivacyAgreement.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/js/components/PrivacyAgreement.jsx"],"names":["PrivacyAgreement","onChange","checked","showError","undefined","propTypes","PropTypes","func","isRequired","bool"],"mappings":";;;;;kBAIwBA,gB;;AAJxB;;;;AACA;;;;AACA;;;;;;AAEe,SAASA,gBAAT,OAA4D;AAAA,MAAhCC,QAAgC,QAAhCA,QAAgC;AAAA,MAAtBC,OAAsB,QAAtBA,OAAsB;AAAA,MAAbC,SAAa,QAAbA,SAAa;;AACzE,SACE;AAAA;AAAA;AACE,kCAAC,2BAAD,IAAmB,cAAnB;AACE,eAASD,OADX;AAEE,qBAAeD,QAFjB;AAGE,YAAK,kBAHP;AAIE,oBAAcE,aAAa,CAACD,OAAd,GAAwB,sDAAxB,GAAiFE,SAJjG;AAKE,aAAO;AAAA;AAAA;AAAA;AAAiC;AAAA;AAAA,YAAG,QAAO,QAAV,EAAmB,MAAK,WAAxB;AAAA;AAAA;AAAjC,OALT;AADF,GADF;AAUD;;AAEDJ,iBAAiBK,SAAjB,GAA6B;AAC3BJ,YAAUK,oBAAUC,IAAV,CAAeC,UADE;AAE3BN,WAASI,oBAAUG,IAAV,CAAeD;AAFG,CAA7B","file":"PrivacyAgreement.js","sourcesContent":["import PropTypes from 'prop-types';\nimport React from 'react';\nimport ErrorableCheckbox from './ErrorableCheckbox';\n\nexport default function PrivacyAgreement({ onChange, checked, showError }) {\n return (\n \n );\n}\n\nPrivacyAgreement.propTypes = {\n onChange: PropTypes.func.isRequired,\n checked: PropTypes.bool.isRequired\n};\n"]}
\ No newline at end of file
diff --git a/lib/js/review/SubmitController.js b/lib/js/review/SubmitController.js
index 6c09fa5..c8bbdef 100644
--- a/lib/js/review/SubmitController.js
+++ b/lib/js/review/SubmitController.js
@@ -27,9 +27,7 @@ var _SubmitButtons = require('./SubmitButtons');
var _SubmitButtons2 = _interopRequireDefault(_SubmitButtons);
-var _PrivacyAgreement = require('../components/PrivacyAgreement');
-
-var _PrivacyAgreement2 = _interopRequireDefault(_PrivacyAgreement);
+var _PreSubmitSection = require('../components/PreSubmitSection');
var _validation = require('../validation');
@@ -75,19 +73,29 @@ var SubmitController = function (_React$Component) {
form = _this$props2.form,
formConfig = _this$props2.formConfig,
pagesByChapter = _this$props2.pagesByChapter,
- privacyAgreementAccepted = _this$props2.privacyAgreementAccepted,
trackingPrefix = _this$props2.trackingPrefix;
- var _isValidForm = (0, _validation.isValidForm)(form, pagesByChapter),
- isValid = _isValidForm.isValid,
- errors = _isValidForm.errors;
+
+ var isValid = void 0;
+ var errors = void 0;
+
+ // If a pre-submit agreement was specified, it has to be accepted first
+ var preSubmitField = formConfig.preSubmitInfo && formConfig.preSubmitInfo.required && (formConfig.preSubmitInfo.field || 'AGREED');
+ if (preSubmitField && !form.data[preSubmitField]) {
+ isValid = false;
+ } else {
+ var _isValidForm = (0, _validation.isValidForm)(form, pagesByChapter);
+
+ isValid = _isValidForm.isValid;
+ errors = _isValidForm.errors;
+ }
if (isValid) {
_this.props.submitForm(formConfig, form);
} else {
// validation errors in this situation are not visible, so we’d
// like to know if they’re common
- if (privacyAgreementAccepted) {
+ if (preSubmitField && form.data[preSubmitField]) {
(0, _helpers.recordEvent)({
event: trackingPrefix + '-validation-failed'
});
@@ -117,30 +125,26 @@ var SubmitController = function (_React$Component) {
}, {
key: 'render',
value: function render() {
+ var _this2 = this;
+
var _props = this.props,
- privacyAgreementAccepted = _props.privacyAgreementAccepted,
+ form = _props.form,
+ formConfig = _props.formConfig,
+ showPreSubmitError = _props.showPreSubmitError,
renderErrorMessage = _props.renderErrorMessage,
- showPrivacyAgreementError = _props.showPrivacyAgreementError,
submission = _props.submission;
return _react2.default.createElement(
'div',
null,
- _react2.default.createElement(
- 'p',
- null,
- _react2.default.createElement(
- 'strong',
- null,
- 'Note:'
- ),
- ' According to federal law, there are criminal penalties, including a fine and/or imprisonment for up to 5 years, for withholding information or for providing incorrect information. (See 18 U.S.C. 1001)'
- ),
- _react2.default.createElement(_PrivacyAgreement2.default, {
+ this.preSubmitInfo && _react2.default.createElement(_PreSubmitSection.PreSubmitSection, {
required: true,
- onChange: this.props.setPrivacyAgreement,
- checked: privacyAgreementAccepted,
- showError: showPrivacyAgreementError }),
+ preSubmitInfo: formConfig.preSubmitInfo,
+ onChange: function onChange() {
+ return _this2.props.setPreSubmit(formConfig.preSubmitInfo.field, _this2.value);
+ },
+ form: form,
+ showError: showPreSubmitError }),
_react2.default.createElement(_SubmitButtons2.default, {
onBack: this.goBack,
onSubmit: this.handleSubmit,
@@ -164,25 +168,23 @@ function mapStateToProps(state, ownProps) {
var pagesByChapter = (0, _helpers.createPageListByChapter)(formConfig);
var trackingPrefix = formConfig.trackingPrefix;
var submission = form.submission;
- var showPrivacyAgreementError = submission.hasAttemptedSubmit;
- var privacyAgreementAccepted = form.data.privacyAgreementAccepted;
+ var showPreSubmitError = submission.hasAttemptedSubmit;
return {
form: form,
formConfig: formConfig,
pagesByChapter: pagesByChapter,
pageList: pageList,
- privacyAgreementAccepted: privacyAgreementAccepted,
renderErrorMessage: renderErrorMessage,
router: router,
submission: submission,
- showPrivacyAgreementError: showPrivacyAgreementError,
+ showPreSubmitError: showPreSubmitError,
trackingPrefix: trackingPrefix
};
}
var mapDispatchToProps = {
- setPrivacyAgreement: _actions.setPrivacyAgreement,
+ setPreSubmit: _actions.setPreSubmit,
setSubmission: _actions.setSubmission,
submitForm: _actions.submitForm
};
@@ -192,10 +194,9 @@ SubmitController.propTypes = {
formConfig: _propTypes2.default.object.isRequired,
pagesByChapter: _propTypes2.default.object.isRequired,
pageList: _propTypes2.default.array.isRequired,
- privacyAgreementAccepted: _propTypes2.default.bool.isRequired,
renderErrorMessage: _propTypes2.default.func,
router: _propTypes2.default.object.isRequired,
- setPrivacyAgreement: _propTypes2.default.func.isRequired,
+ setPreSubmit: _propTypes2.default.func.isRequired,
setSubmission: _propTypes2.default.func.isRequired,
submitForm: _propTypes2.default.func.isRequired,
submission: _propTypes2.default.object.isRequired,
diff --git a/lib/js/review/SubmitController.js.map b/lib/js/review/SubmitController.js.map
index 00cf0c5..d01f44f 100644
--- a/lib/js/review/SubmitController.js.map
+++ b/lib/js/review/SubmitController.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../../../src/js/review/SubmitController.jsx"],"names":["SubmitController","goBack","props","form","pageList","router","eligiblePageList","data","expandedPageList","push","length","path","handleSubmit","formConfig","pagesByChapter","privacyAgreementAccepted","trackingPrefix","isValid","errors","submitForm","event","Raven","captureMessage","extra","prefix","setSubmission","nextProps","nextStatus","submission","status","previousStatus","newRoute","urlPrefix","renderErrorMessage","showPrivacyAgreementError","setPrivacyAgreement","React","Component","mapStateToProps","state","ownProps","hasAttemptedSubmit","mapDispatchToProps","propTypes","PropTypes","object","isRequired","array","bool","func","string"],"mappings":"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","file":"SubmitController.js","sourcesContent":["import React from 'react';\nimport Raven from 'raven-js';\nimport PropTypes from 'prop-types';\nimport { connect } from 'react-redux';\nimport { withRouter } from 'react-router';\n\nimport SubmitButtons from './SubmitButtons';\nimport PrivacyAgreement from '../components/PrivacyAgreement';\nimport { isValidForm } from '../validation';\nimport {\n createPageListByChapter,\n expandArrayPages,\n getActivePages,\n recordEvent\n} from '../helpers';\nimport {\n setPrivacyAgreement,\n setSubmission,\n submitForm\n} from '../actions';\n\nclass SubmitController extends React.Component {\n\n componentWillReceiveProps(nextProps) {\n const nextStatus = nextProps.form.submission.status;\n const previousStatus = this.props.form.submission.status;\n if (nextStatus !== previousStatus && nextStatus === 'applicationSubmitted') {\n const newRoute = `${nextProps.formConfig.urlPrefix}confirmation`;\n this.props.router.push(newRoute);\n }\n }\n\n goBack = () => {\n const {\n form,\n pageList,\n router\n } = this.props;\n\n const eligiblePageList = getActivePages(pageList, form.data);\n const expandedPageList = expandArrayPages(eligiblePageList, this.props.form.data);\n\n router.push(expandedPageList[expandedPageList.length - 2].path);\n }\n\n handleSubmit = () => {\n const {\n form,\n formConfig,\n pagesByChapter,\n privacyAgreementAccepted,\n trackingPrefix\n } = this.props;\n\n const {\n isValid,\n errors\n } = isValidForm(form, pagesByChapter);\n\n if (isValid) {\n this.props.submitForm(formConfig, form);\n } else {\n // validation errors in this situation are not visible, so we’d\n // like to know if they’re common\n if (privacyAgreementAccepted) {\n recordEvent({\n event: `${trackingPrefix}-validation-failed`,\n });\n Raven.captureMessage('Validation issue not displayed', {\n extra: {\n errors,\n prefix: trackingPrefix\n }\n });\n this.props.setSubmission('status', 'validationError');\n }\n this.props.setSubmission('hasAttemptedSubmit', true);\n }\n }\n\n render() {\n const {\n privacyAgreementAccepted,\n renderErrorMessage,\n showPrivacyAgreementError,\n submission\n } = this.props;\n return (\n \n
Note: According to federal law, there are criminal penalties, including a fine and/or imprisonment for up to 5 years, for withholding information or for providing incorrect information. (See 18 U.S.C. 1001)
\n
\n \n \n { this.preSubmitInfo &&
this.props.setPreSubmit(formConfig.preSubmitInfo.field, this.value)}\n form={form}\n showError={showPreSubmitError}/> }\n \n
+ {info.notice}
+ {info.required &&
+
+ }
+
+ );
+}
+
+PreSubmitSection.propTypes = {
+ form: PropTypes.object.isRequired,
+ onChange: PropTypes.func.isRequired,
+ preSubmitInfo: PropTypes.object,
+ showError: PropTypes.bool
+};
diff --git a/src/js/components/PrivacyAgreement.jsx b/src/js/components/PrivacyAgreement.jsx
deleted file mode 100644
index 1f4e8ca..0000000
--- a/src/js/components/PrivacyAgreement.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import ErrorableCheckbox from './ErrorableCheckbox';
-
-export default function PrivacyAgreement({ onChange, checked, showError }) {
- return (
-
- );
-}
-
-PrivacyAgreement.propTypes = {
- onChange: PropTypes.func.isRequired,
- checked: PropTypes.bool.isRequired
-};
diff --git a/src/js/review/SubmitController.jsx b/src/js/review/SubmitController.jsx
index e7ed4af..88664fd 100644
--- a/src/js/review/SubmitController.jsx
+++ b/src/js/review/SubmitController.jsx
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
import { withRouter } from 'react-router';
import SubmitButtons from './SubmitButtons';
-import PrivacyAgreement from '../components/PrivacyAgreement';
+import { PreSubmitSection } from '../components/PreSubmitSection';
import { isValidForm } from '../validation';
import {
createPageListByChapter,
@@ -14,7 +14,7 @@ import {
recordEvent
} from '../helpers';
import {
- setPrivacyAgreement,
+ setPreSubmit,
setSubmission,
submitForm
} from '../actions';
@@ -48,21 +48,27 @@ class SubmitController extends React.Component {
form,
formConfig,
pagesByChapter,
- privacyAgreementAccepted,
trackingPrefix
} = this.props;
- const {
- isValid,
- errors
- } = isValidForm(form, pagesByChapter);
+ let isValid;
+ let errors;
+
+ // If a pre-submit agreement was specified, it has to be accepted first
+ const preSubmitField = formConfig.preSubmitInfo &&
+ formConfig.preSubmitInfo.required && (formConfig.preSubmitInfo.field || 'AGREED');
+ if (preSubmitField && !form.data[preSubmitField]) {
+ isValid = false;
+ } else {
+ ({ isValid, errors } = isValidForm(form, pagesByChapter));
+ }
if (isValid) {
this.props.submitForm(formConfig, form);
} else {
// validation errors in this situation are not visible, so we’d
// like to know if they’re common
- if (privacyAgreementAccepted) {
+ if (preSubmitField && form.data[preSubmitField]) {
recordEvent({
event: `${trackingPrefix}-validation-failed`,
});
@@ -80,19 +86,20 @@ class SubmitController extends React.Component {
render() {
const {
- privacyAgreementAccepted,
+ form,
+ formConfig,
+ showPreSubmitError,
renderErrorMessage,
- showPrivacyAgreementError,
submission
} = this.props;
return (
-
Note: According to federal law, there are criminal penalties, including a fine and/or imprisonment for up to 5 years, for withholding information or for providing incorrect information. (See 18 U.S.C. 1001)
-
+ preSubmitInfo={formConfig.preSubmitInfo}
+ onChange={() => this.props.setPreSubmit(formConfig.preSubmitInfo.field, this.value)}
+ form={form}
+ showError={showPreSubmitError}/> }
{
- return _.set('data.privacyAgreementAccepted', action.privacyAgreementAccepted, state);
+ [SET_PRE_SUBMIT]: (state, action) => {
+ return { ...state, data: { ...state.data, [action.preSubmitField]: action.preSubmitAccepted } };
},
[SET_SUBMISSION]: (state, action) => {
const newState = _.set(['submission', action.field], action.value, state);
diff --git a/src/js/validation.js b/src/js/validation.js
index d3d17f8..21543ba 100644
--- a/src/js/validation.js
+++ b/src/js/validation.js
@@ -188,10 +188,6 @@ export function isValidForm(form, pageListByChapters) {
const v = new Validator();
- if (!form.data.privacyAgreementAccepted) {
- return { isValid: false };
- }
-
return validPages.reduce(({ isValid, errors }, page) => {
const { uiSchema, schema, showPagePerItem, itemFilter, arrayPath } = form.pages[page];
let formData = form.data;
diff --git a/test/js/actions.unit.spec.js b/test/js/actions.unit.spec.js
index a2d3e6e..f06edeb 100644
--- a/test/js/actions.unit.spec.js
+++ b/test/js/actions.unit.spec.js
@@ -8,8 +8,8 @@ import {
SET_EDIT_MODE,
setSubmission,
SET_SUBMISSION,
- setPrivacyAgreement,
- SET_PRIVACY_AGREEMENT,
+ setPreSubmit,
+ SET_PRE_SUBMIT,
setSubmitted,
SET_SUBMITTED,
submitForm,
@@ -48,13 +48,13 @@ describe('Schemaform actions:', () => {
expect(action.type).to.equal(SET_SUBMISSION);
});
});
- describe('setPrivacyAgreement', () => {
+ describe('setPreSubmit', () => {
it('should return action', () => {
const accepted = false;
- const action = setPrivacyAgreement(accepted);
+ const action = setPreSubmit('preSubmitAccepted', accepted);
- expect(action.privacyAgreementAccepted).to.equal(accepted);
- expect(action.type).to.equal(SET_PRIVACY_AGREEMENT);
+ expect(action.preSubmitAccepted).to.equal(accepted);
+ expect(action.type).to.equal(SET_PRE_SUBMIT);
});
});
describe('setSubmitted', () => {
diff --git a/test/js/review/ReviewPage.unit.spec.jsx b/test/js/review/ReviewPage.unit.spec.jsx
index 080993b..6eaf169 100644
--- a/test/js/review/ReviewPage.unit.spec.jsx
+++ b/test/js/review/ReviewPage.unit.spec.jsx
@@ -11,6 +11,13 @@ describe('Schemaform review: ReviewPage', () => {
it('should render chapters', () => {
const formConfig = {
+ preSubmitInfo: {
+ required: true,
+ field: 'privacyAgreementAccepted',
+ notice: 'Notice',
+ label: 'I accept the privacy agreement',
+ error: 'You must accept the privacy agreement'
+ },
chapters: {
chapter1: {
pages: {
@@ -53,7 +60,7 @@ describe('Schemaform review: ReviewPage', () => {
openChapters={[]}
route={{ formConfig, pageList }}
setEditMode={f => f}
- setPrivacyAgreement={f => f}
+ setPreSubmit={f => f}
location={location}/>
);
diff --git a/test/js/review/SubmitController.unit.spec.jsx b/test/js/review/SubmitController.unit.spec.jsx
index c460bd4..8a30f96 100644
--- a/test/js/review/SubmitController.unit.spec.jsx
+++ b/test/js/review/SubmitController.unit.spec.jsx
@@ -6,9 +6,18 @@ import sinon from 'sinon';
import { SubmitController } from '../../../src/js/review/SubmitController';
+const preSubmitInfo = {
+ required: true,
+ field: 'privacyAgreementAccepted',
+ notice: 'Notice
',
+ label: 'I accept the privacy agreement',
+ error: 'You must accept the privacy agreement'
+};
+
describe('Schemaform review: SubmitController', () => {
it('should route to confirmation page after submit', () => {
const formConfig = {
+ preSubmitInfo,
chapters: {
chapter1: {
pages: {
@@ -52,13 +61,17 @@ describe('Schemaform review: SubmitController', () => {
const tree = SkinDeep.shallowRender(
);
tree.getMountedInstance().componentWillReceiveProps({
route: {
- formConfig: {}
+ },
+ formConfig: {
+ urlPrefix: '/',
+ preSubmitInfo
},
form: {
submission: {
@@ -67,13 +80,10 @@ describe('Schemaform review: SubmitController', () => {
data: {
privacyAgreementAccepted: false
}
- },
- formConfig: {
- urlPrefix: '/'
}
});
- expect(router.push.calledWith('confirmation'));
+ expect(router.push.calledWith('/confirmation')).to.be.true;
});
it('should not submit when privacy agreement not accepted', () => {
const form = {
@@ -99,7 +109,9 @@ describe('Schemaform review: SubmitController', () => {
pageKey: 'page2'
}]
};
-
+ const formConfig = {
+ preSubmitInfo
+ };
const submitForm = sinon.spy();
const setSubmission = sinon.spy();
@@ -107,6 +119,7 @@ describe('Schemaform review: SubmitController', () => {
@@ -119,6 +132,7 @@ describe('Schemaform review: SubmitController', () => {
});
it('should not submit when invalid', () => {
const formConfig = {
+ preSubmitInfo,
chapters: {
chapter1: {
pages: {
@@ -182,6 +196,7 @@ describe('Schemaform review: SubmitController', () => {
setSubmission={setSubmission}
submitForm={submitForm}
form={form}
+ formConfig={formConfig}
pagesByChapter={pagesByChapter}
pageList={pageList}
route={{ formConfig, pageList }}/>
@@ -194,6 +209,7 @@ describe('Schemaform review: SubmitController', () => {
});
it('should submit when valid', () => {
const formConfig = {
+ preSubmitInfo,
chapters: {
chapter1: {
pages: {
@@ -257,6 +273,81 @@ describe('Schemaform review: SubmitController', () => {
const tree = SkinDeep.shallowRender(
+ );
+
+ tree.getMountedInstance().handleSubmit();
+
+ expect(submitForm.called).to.be.true;
+ });
+ it('should submit when valid and no preSubmit specified', () => {
+ const formConfig = {
+ chapters: {
+ chapter1: {
+ pages: {
+ page1: {
+ schema: {}
+ }
+ }
+ },
+ chapter2: {
+ pages: {
+ page2: {
+ }
+ }
+ }
+ }
+ };
+
+ const pagesByChapter = {
+ chapter1: [{
+ chapterKey: 'chapter1',
+ pageKey: 'page1'
+ }],
+ chapter2: [{
+ chapterKey: 'chapter2',
+ pageKey: 'page2'
+ }]
+ };
+
+ const form = {
+ submission: {
+ hasAttemptedSubmit: false
+ },
+ pages: {
+ page1: {
+ schema: {},
+ },
+ page2: {
+ schema: {},
+ },
+ },
+ data: {}
+ };
+
+ const pageList = [
+ {
+ path: 'previous-page'
+ },
+ {
+ path: 'testing',
+ pageKey: 'testPage'
+ },
+ {
+ path: 'next-page'
+ }
+ ];
+
+ const submitForm = sinon.spy();
+
+ const tree = SkinDeep.shallowRender(
+ {
push: sinon.spy()
};
const formConfig = {
+ preSubmitInfo,
chapters: {
chapter1: {
pages: {
@@ -306,14 +398,14 @@ describe('Schemaform review: SubmitController', () => {
const tree = mount(
).instance();
tree.goBack();
- expect(router.push.calledWith('previous-page'));
+ expect(router.push.called).to.be.true;
});
});
diff --git a/test/js/state/index.unit.spec.js b/test/js/state/index.unit.spec.js
index e6a23a0..f1d8654 100644
--- a/test/js/state/index.unit.spec.js
+++ b/test/js/state/index.unit.spec.js
@@ -5,7 +5,7 @@ import {
OPEN_REVIEW_CHAPTER,
SET_DATA,
SET_EDIT_MODE,
- SET_PRIVACY_AGREEMENT,
+ SET_PRE_SUBMIT,
SET_SUBMISSION,
SET_SUBMITTED
} from '../../../src/js/actions';
@@ -15,6 +15,13 @@ import createSchemaFormReducer from '../../../src/js/state';
describe('schemaform createSchemaFormReducer', () => {
it('creates a reducer with initial state for each page', () => {
const formConfig = {
+ preSubmitInfo: {
+ required: true,
+ field: 'privacyAgreementAccepted',
+ notice: 'Notice',
+ label: 'I accept the privacy agreement',
+ error: 'You must accept the privacy agreement'
+ },
disableSave: true,
chapters: {
test: {
@@ -181,8 +188,9 @@ describe('schemaform createSchemaFormReducer', () => {
privacyAgreementAccepted: false
}
}, {
- type: SET_PRIVACY_AGREEMENT,
- privacyAgreementAccepted: true
+ type: SET_PRE_SUBMIT,
+ preSubmitField: 'privacyAgreementAccepted',
+ preSubmitAccepted: true
});
expect(state.data.privacyAgreementAccepted).to.be.true;