Revert "Update parameter <select> elements to render 'invalid' classes. Add '.invalid' CSS for <select> elements. Rework validateParam() function. Added .btn-sm class for "Add item" and "Remove item" buttons in array parameters. Reduce border-width on <select> elements inside parameters. Update tests for utils.validateParam()."

This reverts commit 666e22f.

Author: owenconti

src/core/components/layout-utils.jsx

@@ -129,8 +129,7 @@ export class Select extends React.Component {
     value: PropTypes.any,
     onChange: PropTypes.func,
     multiple: PropTypes.bool,
-    allowEmptyValue: PropTypes.bool,
-    className: PropTypes.string
+    allowEmptyValue: PropTypes.bool
   }
 
   static defaultProps = {
@@ -143,7 +142,7 @@ export class Select extends React.Component {
 
     let value
 
-    if (props.value) {
+    if (props.value !== undefined) {
       value = props.value
     } else {
       value = props.multiple ? [""] : ""
@@ -179,7 +178,7 @@ export class Select extends React.Component {
     let value = this.state.value.toJS ? this.state.value.toJS() : this.state.value
 
     return (
-      <select className={this.props.className} multiple={ multiple } value={ value } onChange={ this.onChange } >
+      <select multiple={ multiple } value={ value } onChange={ this.onChange } >
         { allowEmptyValue ? <option value="">--</option> : null }
         {
           allowedValues.map(function (item, key) {

src/core/json-schema-components.js

@@ -57,8 +57,7 @@ export class JsonSchema_string extends Component {
 
     if ( enumValue ) {
       const Select = getComponent("Select")
-      return (<Select className={ errors.length ? "invalid" : ""}
-                      allowedValues={ enumValue }
+      return (<Select allowedValues={ enumValue }
                       value={ value }
                       allowEmptyValue={ !required }
                       onChange={ this.onEnumChange }/>)
@@ -122,7 +121,6 @@ export class JsonSchema_array extends PureComponent {
   render() {
     let { getComponent, required, schema, fn } = this.props
 
-    let errors = schema.errors || []
     let itemSchema = fn.inferSchema(schema.items)
 
     const JsonSchemaForm = getComponent("JsonSchemaForm")
@@ -133,17 +131,19 @@ export class JsonSchema_array extends PureComponent {
 
     if ( enumValue ) {
       const Select = getComponent("Select")
-      return (<Select className={ errors.length ? "invalid" : ""}
-                     multiple={ true }
+      return (<Select multiple={ true }
                      value={ value }
                      allowedValues={ enumValue }
                      allowEmptyValue={ !required }
                      onChange={ this.onEnumChange }/>)
     }
 
+    let errors = schema.errors || []
+
     return (
       <div>
-        { !value || value.count() < 1 ? null : 
+        { !value || value.count() < 1 ?
+          (errors.length ? <span style={{ color: "red", fortWeight: "bold" }}>{ errors[0] }</span> : null) :
           value.map( (item,i) => {
             let schema = Object.assign({}, itemSchema)
             if ( errors.length ) {
@@ -153,12 +153,12 @@ export class JsonSchema_array extends PureComponent {
           return (
             <div key={i} className="json-schema-form-item">
               <JsonSchemaForm fn={fn} getComponent={getComponent} value={item} onChange={(val) => this.onItemChange(val, i)} schema={schema} />
-              <Button className="btn btn-sm json-schema-form-item-remove" onClick={()=> this.removeItem(i)} > - </Button>
+              <Button className="json-schema-form-item-remove" onClick={()=> this.removeItem(i)} > - </Button>
             </div>
             )
           }).toArray()
         }
-        <Button className={`btn btn-sm json-schema-form-item-add ${errors.length ? "invalid" : null}`} onClick={this.addItem}> Add item </Button>
+        <Button className="json-schema-form-item-add" onClick={this.addItem}> Add item </Button>
       </div>
     )
   }
@@ -170,14 +170,12 @@ export class JsonSchema_boolean extends Component {
 
   onEnumChange = (val) => this.props.onChange(val)
   render() {
-    let { getComponent, value, schema } = this.props
-    let errors = schema.errors || []
+    let { getComponent, required, value } = this.props
     const Select = getComponent("Select")
 
-    return (<Select className={ errors.length ? "invalid" : ""}
-                    value={ String(value) }
+    return (<Select value={ String(value) }
                     allowedValues={ fromJS(["true", "false"]) }
-                    allowEmptyValue={true}
+                    allowEmptyValue={ !required }
                     onChange={ this.onEnumChange }/>)
   }
 }

src/core/utils.js

@@ -468,85 +468,59 @@ export const validateFile = ( val ) => {
   }
 }
 
-export const validateBoolean = ( val ) => {
-  if ( !(val === "true" || val === "false" || val === true || val === false) ) {
-    return "Value must be a boolean"
-  }
-}
-
-export const validateString = ( val ) => {
-  if ( val && typeof val !== "string" ) {
-    return "Value must be a string"
-  }
-}
-
 // validation of parameters before execute
 export const validateParam = (param, isXml) => {
   let errors = []
   let value = isXml && param.get("in") === "body" ? param.get("value_xml") : param.get("value")
   let required = param.get("required")
   let type = param.get("type")
 
-  // If the parameter is required OR the parameter has a value (meaning optional, but filled in)
-  // then we should do our validation routine
-  if ( required || value ) {
-    // These checks should evaluate to true if the parameter's value is valid
-    let stringCheck = type === "string" && value && !validateString(value)
-    let arrayCheck = type === "array" && Array.isArray(value) && value.length
-    let listCheck = type === "array" && Im.List.isList(value) && value.count()
-    let fileCheck = type === "file" && value instanceof win.File
-    let booleanCheck = type === "boolean" && !validateBoolean(value)
-    let numberCheck = type === "number" && !validateNumber(value) // validateNumber returns undefined if the value is a number
-    let integerCheck = type === "integer" && !validateInteger(value) // validateInteger returns undefined if the value is an integer
-
-    if ( required && !(stringCheck || arrayCheck || listCheck || fileCheck || booleanCheck || numberCheck || integerCheck) ) {
-      errors.push("Required field is not provided")
-      return errors
-    }
+  let stringCheck = type === "string" && !value
+  let arrayCheck = type === "array" && Array.isArray(value) && !value.length
+  let listCheck = type === "array" && Im.List.isList(value) && !value.count()
+  let fileCheck = type === "file" && !(value instanceof win.File)
 
-    if ( type === "string" ) {
-      let err = validateString(value)
-      if (!err) return errors
-      errors.push(err)
-    } else if ( type === "boolean" ) {
-      let err = validateBoolean(value)
-      if (!err) return errors
-      errors.push(err)
-    } else if ( type === "number" ) {
-      let err = validateNumber(value)
-      if (!err) return errors
-      errors.push(err)
-    } else if ( type === "integer" ) {
-      let err = validateInteger(value)
-      if (!err) return errors
-      errors.push(err)
-    } else if ( type === "array" ) {
-      let itemType
-
-      if ( !value.count() ) { return errors }
-
-      itemType = param.getIn(["items", "type"])
-
-      value.forEach((item, index) => {
-        let err
-
-        if (itemType === "number") {
-          err = validateNumber(item)
-        } else if (itemType === "integer") {
-          err = validateInteger(item)
-        } else if (itemType === "string") {
-          err = validateString(item)
-        }
+  if ( required && (stringCheck || arrayCheck || listCheck || fileCheck) ) {
+    errors.push("Required field is not provided")
+    return errors
+  }
 
-        if ( err ) {
-          errors.push({ index: index, error: err})
-        }
-      })
-    } else if ( type === "file" ) {
-      let err = validateFile(value)
-      if (!err) return errors
-      errors.push(err)
-    }
+  if ( value === null || value === undefined ) {
+    return errors
+  }
+
+  if ( type === "number" ) {
+    let err = validateNumber(value)
+    if (!err) return errors
+    errors.push(err)
+  } else if ( type === "integer" ) {
+    let err = validateInteger(value)
+    if (!err) return errors
+    errors.push(err)
+  } else if ( type === "array" ) {
+    let itemType
+
+    if ( !value.count() ) { return errors }
+
+    itemType = param.getIn(["items", "type"])
+
+    value.forEach((item, index) => {
+      let err
+
+      if (itemType === "number") {
+        err = validateNumber(item)
+      } else if (itemType === "integer") {
+        err = validateInteger(item)
+      }
+
+      if ( err ) {
+        errors.push({ index: index, error: err})
+      }
+    })
+  } else if ( type === "file" ) {
+    let err = validateFile(value)
+    if (!err) return errors
+    errors.push(err)
   }
 
   return errors

src/style/_buttons.scss

@@ -14,11 +14,6 @@
 
     @include text_headline();
 
-    &.btn-sm {
-        font-size: 12px;
-        padding: 4px 23px;
-    }
-
     &[disabled]
     {
         cursor: not-allowed;
@@ -170,9 +165,6 @@
 button
 {
     cursor: pointer;
-    outline: none;
 
-    &.invalid {
-        @include invalidFormElement();
-    }
+    outline: none;
 }

src/style/_form.scss

@@ -21,10 +21,6 @@ select
 
         background: #f7f7f7;
     }
-
-    &.invalid {
-        @include invalidFormElement();
-    }
 }
 
 .opblock-body select
@@ -57,8 +53,12 @@ input[type=file]
     border-radius: 4px;
     background: #fff;
 
-    &.invalid {
-        @include invalidFormElement();
+    &.invalid
+    {
+        animation: shake .4s 1;
+
+        border-color: $_color-delete;
+        background: lighten($_color-delete, 35%);
     }
 }
 

src/style/_mixins.scss

@@ -166,9 +166,3 @@ $browser-context: 16;
         @warn 'Breakpoint mixin supports: tablet, mobile, desktop';
     }
 }
-
-@mixin invalidFormElement() {
-    animation: shake .4s 1;
-    border-color: $_color-delete;
-    background: lighten($_color-delete, 35%);
-}

src/style/_table.scss

@@ -97,10 +97,6 @@ table
         width: 100%;
         max-width: 340px;
     }
-
-    select {
-        border-width: 1px;
-    }
 }
 
 .parameter__name