Restructure, Clean up, Init BooleanField

Author: Emmanouil Konstantinidis

rest_framework_docs/static/rest_framework_docs/js/components/liveapi.js

@@ -16,9 +16,9 @@ var LiveAPIEndpoints = React.createClass({
 
   getData: function () {
     var method = this.refs.request.state.selectedMethod;
-    return RequestUtils.shouldAddData(method) ? null : (
+    return RequestUtils.shouldIncludeData(method) ? (
       this.refs.request.state.data
-    );
+    ) : null;
   },
 
   makeRequest: function (event) {

rest_framework_docs/static/rest_framework_docs/js/components/request.js

@@ -2,12 +2,10 @@ var _ = require('underscore');
 var React = require('react');
 
 var AddFieldsForm = require('./request/add-fields');
-var Header = require('./helpers/header');
 var Headers = require('./request/headers');
 var Data = require('./request/data');
 var FieldUrl = require('./request/field-url');
 var Methods = require('./request/methods');
-var RequestUtils = require('../utils/request');
 
 var Request = React.createClass({
   getInitialState: function () {
@@ -97,6 +95,7 @@ var Request = React.createClass({
 
   render: function () {
     var endpoint = this.state.endpoint;
+
     return (
       <div>
         <h3>Request</h3>
@@ -116,18 +115,15 @@ var Request = React.createClass({
           permissions={this.state.endpoint.permissions}
           handleHeaderChange={this.handleHeaderChange} />
 
-        {RequestUtils.shouldAddData(this.state.method) ? null : (
-          <div>
-            {this.state.endpoint.fields.length ? <Header title='Data' /> : null}
-            <Data
-              fields={endpoint.fields}
-              data={this.state.data}
-              removeCustomField={this.removeField}
-              onChange={this.handleDataFieldChange} />
-
-            <AddFieldsForm onAdd={this.addField} />
-          </div>
-        )}
+        <Data
+          method={this.state.selectedMethod}
+          fields={endpoint.fields}
+          data={this.state.data}
+          removeCustomField={this.removeField}
+          onChange={this.handleDataFieldChange} />
+
+        <AddFieldsForm
+          onAdd={this.addField} />
       </div>
     );
   }

rest_framework_docs/static/rest_framework_docs/js/components/request/data.js

@@ -1,20 +1,10 @@
 var React = require('react');
 
 var FieldText = require('../fields/text');
+var Header = require('../helpers/header');
+var RequestUtils = require('../../utils/request');
 
 var Data = React.createClass({
-  getInitialState: function() {
-    return {
-      fields: this.props.fields
-    };
-  },
-
-  componentWillReceiveProps: function(nextProps) {
-    this.setState({
-      fields: nextProps.fields
-    });
-  },
-
   removeCustomField: function (fieldName) {
     this.props.removeCustomField(fieldName);
   },
@@ -23,6 +13,10 @@ var Data = React.createClass({
     this.props.onChange(event.target.value, fieldName);
   },
 
+  _renderBooleanField: function (field, key) {
+    console.log(field, key);
+  },
+
   _renderTextInput: function (field, key) {
     var value = this.props.data[field.name];
     var type = field.name == 'password' ? 'password' : 'text';
@@ -41,17 +35,31 @@ var Data = React.createClass({
   },
 
   _renderFields: function () {
-    return this.state.fields.map(function (field, key) {
+    return this.props.fields.map(function (field, key) {
+
       switch (field.type) {
+      case ('BooleanField'):
+        return this._renderBooleanField(field, key);
+
       case ('CharField'):
+      default:
         return this._renderTextInput(field, key);
+
       }
     }, this);
   },
 
   render: function () {
+    if (!RequestUtils.shouldIncludeData(this.props.method)) {
+      return null;
+    }
+
     return (
       <div>
+
+        {this.props.fields.length ? <Header title='Data' /> : null}
+
+
         {this._renderFields()}
       </div>
     );

rest_framework_docs/static/rest_framework_docs/js/dist.js

@@ -1,10 +1,10 @@
 module.exports = {
 
-  shouldAddData: function (method) {
+  shouldIncludeData: function (method) {
     if (method === 'GET' || method === 'OPTIONS') {
-      return true;
+      return false;
     }
-    return false;
+    return true;
   },
 
   shouldAddHeader: function (permissions) {