Merge pull request marmelab#55 from marmelab/reference_many_field_view

[RFR] Implement ReferenceMany, Choice and Choices Field views and fix SelectField css

Author: manuquentin

app/Actions/EntityActions.js

@@ -66,11 +66,12 @@ export default {
         });
     },
 
-    updateData(fieldName, value) {
+    updateData(fieldName, value, choiceFields=[]) {
         AppDispatcher.dispatch({
             actionType: 'update_data',
             fieldName,
-            value
+            value,
+            choiceFields
         });
     },
 

app/Actions/__mocks__/ListActions.js

@@ -18,13 +18,17 @@ import ReferenceManyFieldView from './Field/ReferenceManyFieldView';
 import TextFieldView from './Field/TextFieldView';
 import TemplateFieldView from './Field/TemplateFieldView';
 import WysiwygFieldView from './Field/WysiwygFieldView';
+import ChoiceFieldView from './Field/ChoiceFieldView';
+import ChoicesFieldView from './Field/ChoicesFieldView';
 
 FieldViewConfiguration.registerFieldView('boolean', BooleanFieldView);
 FieldViewConfiguration.registerFieldView('date', DateFieldView);
 FieldViewConfiguration.registerFieldView('datetime', DateFieldView);
 FieldViewConfiguration.registerFieldView('email', EmailFieldView);
 FieldViewConfiguration.registerFieldView('json', JsonFieldView);
 FieldViewConfiguration.registerFieldView('number', NumberFieldView);
+FieldViewConfiguration.registerFieldView('choice', ChoiceFieldView);
+FieldViewConfiguration.registerFieldView('choices', ChoicesFieldView);
 FieldViewConfiguration.registerFieldView('referenced_list', ReferencedListFieldView);
 FieldViewConfiguration.registerFieldView('reference', ReferenceFieldView);
 FieldViewConfiguration.registerFieldView('reference_many', ReferenceManyFieldView);

app/AdminBootstrap.js

@@ -1,12 +1,11 @@
-jest.dontMock('../MaBackButton');
-
-const React = require('react/addons');
-const TestUtils = React.addons.TestUtils;
+jest.autoMockOff();
 
 describe('MaBackButton', () => {
-    let MaBackButton;
+    let React, TestUtils, MaBackButton;
 
     beforeEach(() => {
+        React = require('react/addons');
+        TestUtils = React.addons.TestUtils;
         MaBackButton = require('../MaBackButton');
     });
 

app/Component/Button/__tests__/MaBackButtonTest.js

@@ -1,13 +1,12 @@
 jest.autoMockOff();
 jest.setMock('react-router', {Link : require('../__mocks__/Link')});
 
-const React = require('react/addons');
-const TestUtils = React.addons.TestUtils;
-
 describe('MaCreateButton', () => {
-    let MaCreateButton;
+    let React, TestUtils, MaCreateButton;
 
     beforeEach(() => {
+        React = require('react/addons');
+        TestUtils = React.addons.TestUtils;
         MaCreateButton = require('../MaCreateButton');
     });
 

app/Component/Button/__tests__/MaCreateButtonTest.js

@@ -1,19 +1,17 @@
 jest.autoMockOff();
 jest.setMock('react-router', {Link : require('../__mocks__/Link')});
 
-const React = require('react/addons');
-const TestUtils = React.addons.TestUtils;
-
 describe('MaDeleteButton', () => {
-    let MaDeleteButton;
-    let entry;
+    let React, TestUtils, MaDeleteButton, entry;
 
     beforeEach(() => {
+        React = require('react/addons');
+        TestUtils = React.addons.TestUtils;
         MaDeleteButton = require('../MaDeleteButton');
 
         entry = {
             identifierValue: 23
-        }
+        };
     });
 
     describe('With good props', () => {

app/Component/Button/__tests__/MaDeleteButtonTest.js

@@ -1,19 +1,17 @@
 jest.autoMockOff();
 jest.setMock('react-router', {Link : require('../__mocks__/Link')});
 
-const React = require('react/addons');
-const TestUtils = React.addons.TestUtils;
-
 describe('MaEditButton', () => {
-    let MaEditButton;
-    let entry;
+    let React, TestUtils, MaEditButton, entry;
 
     beforeEach(() => {
+        React = require('react/addons');
+        TestUtils = React.addons.TestUtils;
         MaEditButton = require('../MaEditButton');
 
         entry = {
             identifierValue: 23
-        }
+        };
     });
 
     describe('With good props', () => {

app/Component/Button/__tests__/MaEditButtonTest.js

@@ -1,13 +1,12 @@
 jest.autoMockOff();
 jest.setMock('react-router', {Link : require('../__mocks__/Link')});
 
-const React = require('react/addons');
-const TestUtils = React.addons.TestUtils;
-
 describe('MaListButton', () => {
-    let MaListButton;
+    let React, TestUtils, MaListButton;
 
     beforeEach(() => {
+        React = require('react/addons');
+        TestUtils = React.addons.TestUtils;
         MaListButton = require('../MaListButton');
     });
 

app/Component/Button/__tests__/MaListButtonTest.js

@@ -1,19 +1,17 @@
 jest.autoMockOff();
 jest.setMock('react-router', {Link : require('../__mocks__/Link')});
 
-const React = require('react/addons');
-const TestUtils = React.addons.TestUtils;
-
 describe('MaShowButton', () => {
-    let MaShowButton;
-    let entry;
+    let React, TestUtils, MaShowButton, entry;
 
     beforeEach(() => {
+        React = require('react/addons');
+        TestUtils = React.addons.TestUtils;
         MaShowButton = require('../MaShowButton');
 
         entry = {
             identifierValue: 23
-        }
+        };
     });
 
     describe('With good props', () => {

app/Component/Button/__tests__/MaShowButtonTest.js

@@ -0,0 +1,27 @@
+import React from 'react';
+
+class ChoicesColumn extends React.Component {
+    render() {
+        const { values } = this.props;
+
+        if (!values) {
+            return <span />;
+        }
+
+        return (
+            <span className="choices-column">
+                {values.map((value, i) => {
+                    return <span className="label label-default">{value}</span>
+                })}
+            </span>
+        );
+    }
+}
+
+ChoicesColumn.propTypes = {
+    values: React.PropTypes.array.isRequired
+};
+
+require('../../autoloader')('ChoicesColumn', ChoicesColumn);
+
+export default ChoicesColumn;