Merge branch 'release/0.9.11'

README.md

@@ -1,5 +1,5 @@
 ![alt tag](https://working-minds.github.io/realizejs/assets/img/content/realizejs.png)
 
-### Current version: 0.9.10 beta
+### Current version: 0.9.11 beta
 
 Read the documentation on how to get started on [Realize.js](https://working-minds.github.io/realizejs/en)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "realizejs",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "authors": [
     "Ariel Lindgren <[email protected]>",
     "Pedro Jesus <[email protected]>",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "realizejs",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "description": "A rich set of UI components based on Material Design using React.js",
   "authors": [
     "Ariel Lindgren <[email protected]>",

src/js/components/grid_form/grid_form.js

@@ -72,6 +72,9 @@ export default class GridForm extends Component {
     eagerLoad: true,
     readOnly: false,
     formComponent: Form,
+    data: {
+      dataRows: []
+    },
     onSubmit() {},
     onReset() {},
     onSuccess() { return true; },
@@ -87,7 +90,7 @@ export default class GridForm extends Component {
     selectedDataRow: {},
     selectedRowId: null,
     isLoading: this.props.isLoading,
-    clientSideData: [],
+    clientSideData: this.props.data.dataRows,
   };
 
   constructor(props) {

src/js/components/input/grid_form/input_grid_form.js

@@ -2,6 +2,7 @@ import React from 'react';
 import _ from 'lodash';
 import PropTypes from '../../../prop_types';
 import { autobind, mixin } from '../../../utils/decorators';
+import { uuid } from '../../../utils';
 
 import GridForm from '../../grid_form/grid_form';
 import InputGridFormFields from './input_grid_form_fields';
@@ -31,6 +32,7 @@ export default class InputGridForm extends InputBase {
     fields: {},
     form: {},
     clientSide: true,
+    clientSideIdField: '_clientSideId',
     inputWrapperComponent: null,
     onSuccess() {},
     onDestroySuccess() {},
@@ -58,6 +60,15 @@ export default class InputGridForm extends InputBase {
     }));
   }
 
+  buildGridData() {
+    const { value, clientSideIdField } = this.props;
+    const dataRows = !value || value === ''
+      ? []
+      : value.map((v) => { return { ...v, [clientSideIdField]: uuid.v4() }; });
+
+    return { dataRows };
+  }
+
   /* GridForm Result serializer */
 
   serialize() {
@@ -108,6 +119,7 @@ export default class InputGridForm extends InputBase {
           formComponent={InputGridFormFields}
           form={this.parseFormProp()}
           columns={this.parseColumnsProp()}
+          data={this.buildGridData()}
           onSuccess={this.handleOnSuccess}
           onDestroySuccess={this.handleOnDestroySuccess}
           errors={this.props.errors}

src/js/components/table/table_cell.js

@@ -136,7 +136,7 @@ export default class TableCell extends Component {
 
   renderFormattedValue(value) {
     const valueFormatter = this.getValueFormatter().bind(this);
-    return (!_.isEmpty(value) || typeof value === 'boolean') ? valueFormatter(value) : '-';
+    return (!_.isEmpty(value) || typeof value === 'boolean' || typeof value === 'number') ? valueFormatter(value) : '-';
   }
 
   renderValue() {

src/js/mixins/input/select_component_mixin.js

@@ -251,17 +251,16 @@ export default {
 
   /* Serializer functions */
 
-  getDisplayValues () {
-    return map(this.selectedOptions(), function(selectedOption) {
-      return selectedOption[this.props.nameField];
-    }.bind(this));
-  },
+  getSelectValue() {
+    const { multiple } = this.props;
+    const { value } = this.state;
 
-  serialize () {
-    var serializedInput = {};
-    serializedInput[this.props.name] = this.getValue();
-    serializedInput[this.props.name + "Display"] = this.getDisplayValues();
+    return (!multiple && Array.isArray(value))
+      ? value[0]
+      : value;
+  },
 
-    return serializedInput;
-  }
-}
+  serialize() {
+    return { [this.props.name]: this.getSelectValue() };
+  },
+};