Do not enforce requirement for widget id prop.

Author: n1k0

src/components/widgets/AltDateTimeWidget.js

@@ -10,7 +10,7 @@ function AltDateTimeWidget(props) {
 if (process.env.NODE_ENV !== "production") {
  AltDateTimeWidget.propTypes = {
  schema: PropTypes.object.isRequired,
- id: PropTypes.string.isRequired,
+ id: PropTypes.string,
  placeholder: PropTypes.string,
  value: React.PropTypes.string,
  required: PropTypes.bool,

src/components/widgets/AltDateWidget.js

@@ -129,7 +129,7 @@ class AltDateWidget extends Component {
 if (process.env.NODE_ENV !== "production") {
  AltDateWidget.propTypes = {
  schema: PropTypes.object.isRequired,
- id: PropTypes.string.isRequired,
+ id: PropTypes.string,
  placeholder: PropTypes.string,
  value: React.PropTypes.string,
  required: PropTypes.bool,

src/components/widgets/BaseInput.js

@@ -22,7 +22,7 @@ BaseInput.defaultProps = {
 
 if (process.env.NODE_ENV !== "production") {
  BaseInput.propTypes = {
- id: PropTypes.string.isRequired,
+ id: PropTypes.string,
  placeholder: PropTypes.string,
  value: PropTypes.any,
  required: PropTypes.bool,

src/components/widgets/CheckboxWidget.js

@@ -29,7 +29,7 @@ function CheckboxWidget({
 if (process.env.NODE_ENV !== "production") {
  CheckboxWidget.propTypes = {
  schema: PropTypes.object.isRequired,
- id: PropTypes.string.isRequired,
+ id: PropTypes.string,
  onChange: PropTypes.func,
  value: PropTypes.bool,
  required: PropTypes.bool,

src/components/widgets/HiddenWidget.js

@@ -9,7 +9,7 @@ function HiddenWidget({id, value}) {
 
 if (process.env.NODE_ENV !== "production") {
  HiddenWidget.propTypes = {
- id: PropTypes.string.isRequired,
+ id: PropTypes.string,
  value: PropTypes.oneOfType([
  React.PropTypes.string,
  React.PropTypes.number,

src/components/widgets/RadioWidget.js

@@ -38,7 +38,7 @@ function RadioWidget({
 if (process.env.NODE_ENV !== "production") {
  RadioWidget.propTypes = {
  schema: PropTypes.object.isRequired,
- id: PropTypes.string.isRequired,
+ id: PropTypes.string,
  options: PropTypes.array.isRequired,
  placeholder: PropTypes.string,
  value: PropTypes.any,

src/components/widgets/SelectWidget.js

@@ -59,7 +59,7 @@ function SelectWidget({
 if (process.env.NODE_ENV !== "production") {
  SelectWidget.propTypes = {
  schema: PropTypes.object.isRequired,
- id: PropTypes.string.isRequired,
+ id: PropTypes.string,
  options: PropTypes.array.isRequired,
  placeholder: PropTypes.string,
  value: PropTypes.any,

src/components/widgets/TextareaWidget.js

@@ -27,7 +27,7 @@ function TextWidget({
 if (process.env.NODE_ENV !== "production") {
  TextWidget.propTypes = {
  schema: PropTypes.object.isRequired,
- id: PropTypes.string.isRequired,
+ id: PropTypes.string,
  placeholder: PropTypes.string,
  value: PropTypes.string,
  required: PropTypes.bool,

src/validate.js

@@ -53,7 +53,7 @@ function toErrorSchema(errors) {
  if (Array.isArray(parent.__errors)) {
  // We store the list of errors for this node in a property named __errors
  // to avoid name collision with a possible sub schema field named
- // "errors" (see `validate.createErrorHandler`).
+ // "errors" (see `createErrorHandler`).
  parent.__errors = parent.__errors.concat(message);
  } else {
  parent.__errors = [message];
@@ -62,7 +62,7 @@ function toErrorSchema(errors) {
  }, {});
 }
 
-export function toErrorList(errorSchema) {
+function toErrorList(errorSchema) {
  return Object.keys(errorSchema).reduce((acc, key) => {
  const field = errorSchema[key];
  if ("__errors" in field) {
@@ -79,7 +79,7 @@ function createErrorHandler(formData) {
  const handler = {
  // We store the list of errors for this node in a property named __errors
  // to avoid name collision with a possible sub schema field named
- // "errors" (see `utils.toErrorSchema`).
+ // "errors" (see `toErrorSchema`).
  __errors: [],
  addError(message) {
  this.__errors.push(message);
@@ -105,9 +105,18 @@ function unwrapErrorHandler(errorHandler) {
 }
 
 /**
- * This function processes the formData with a user `validate` contributed
- * function, which receives the form data and an `errorHandler` object that
- * will be used to add custom validation errors for each field.
+ * This function processes the formData against:
+ *
+ * 1. A JSON schema object, then
+ * 2. An optional `validate` contributed function, which receives the form data
+ * and an `errorHandler` object used to add custom validation errors for each
+ * field.
+ *
+ * It returns a Promise resolving with an object exposing the following
+ * properties:
+ *
+ * - `errors`: The list of encountered validation errors;
+ * - `errorSchema`: An error tree matching the formData structure.
  *
  * @return {Promise}
  */
@@ -121,8 +130,8 @@ export default function validateFormData(formData, schema, customValidate) {
 
  const errorHandler = createErrorHandler(formData);
  return Promise.resolve(customValidate(formData, errorHandler))
- .then(UserErrorHandler => {
- const userErrorSchema = unwrapErrorHandler(UserErrorHandler);
+ .then(userErrorHandler => {
+ const userErrorSchema = unwrapErrorHandler(userErrorHandler);
  const newErrorSchema = mergeObjects(errorSchema, userErrorSchema, true);
  // XXX: The errors list produced is not fully compliant with the format
  // exposed by the jsonschema lib, which contains full field paths and other

test/validate_test.js

@@ -18,7 +18,7 @@ describe("Validation", () => {
 
  let errors, errorSchema;
 
- beforeEach(() => {
+ beforeEach(function* () {
  return validateFormData({foo: 42}, schema)
  .then(result => {
  errors = result.errors;
@@ -49,7 +49,7 @@ describe("Validation", () => {
  }
  };
 
- beforeEach(() => {
+ beforeEach(function* () {
  const validate = (formData, errors) => {
  if (formData.pass1 !== formData.pass2) {
  errors.pass2.addError("passwords don't match.");
@@ -119,7 +119,7 @@ describe("Validation", () => {
 
  var comp, node, onError;
 
- beforeEach(() => {
+ beforeEach(function* () {
  onError = sandbox.spy();
  const compInfo = createFormComponent({schema, formData: {
  foo: undefined
@@ -165,7 +165,7 @@ describe("Validation", () => {
 
  var comp, node, onError;
 
- beforeEach(() => {
+ beforeEach(function* () {
  onError = sandbox.spy();
  const compInfo = createFormComponent({schema, formData: {
  foo: "123456789"