Merge branch 'develop' of https://github.com/highideas/iClient-react into develop

Author: GabrielDeveloper

app/components/Area/Create/Area.js

@@ -21,9 +21,13 @@ class Area extends React.Component
         e.preventDefault();
 
         let form = e.target;
+        let parent = '';
+        if (form.querySelector('[name="parent"]')) {
+            parent = form.querySelector('[name="parent"]').value;
+        }
         let formData = {
             _id : this.refs.area.value,
-            parent: form.querySelector('[name="parent"]').value
+            parent: parent
         };
 
         this.setState({area: formData});

app/components/Area/List/Area.js

@@ -13,6 +13,8 @@ class Area extends React.Component
             areas : null,
             error : ''
         };
+        this.showError = this.showError.bind(this);
+        this.listAreas = this.listAreas.bind(this);
         this.getAreas();
     }
 
@@ -27,15 +29,11 @@ class Area extends React.Component
         });
     }
 
-    render() {
+    listAreas() {
         if (this.state.error) {
-            return (<Error error={this.state.error} />);
-        }
-        if (!this.state.areas) {
-            return <div>Loading...</div>;
+            return '';
         }
-        const areaList = this.state.areas.map((area, key) => {
-            let line = ((key % 2) ? 'is-success' : 'is-info');
+        return this.state.areas.map((area, key) => {
             return (
                 <tr key={key}>
                     <td>
@@ -44,10 +42,24 @@ class Area extends React.Component
                 </tr>
             );
         });
+    }
+
+    showError() {
+        if (this.state.error) {
+            return (<Error error={this.state.error} />);
+        }
+        return '';
+    }
+
+    render() {
+        if (!this.state.areas && !this.state.error) {
+            return <div>Loading...</div>;
+        }
 
         return (
             <section className="">
                 <div className="container hello">
+                    { this.showError() }
                     <div className="level header">
                         <div className="level-left">
                             <h2 className="title is-2">Areas</h2>
@@ -63,7 +75,7 @@ class Area extends React.Component
                     </div>
                     <table className="table">
                         <tbody>
-                            { areaList }
+                            { this.listAreas() }
                         </tbody>
                     </table>
                 </div>

docker-compose.yml

@@ -4,6 +4,9 @@ services:
         image: node:6.7.0
         container_name: iClientReact
         restart: always
+        environment:
+         - HOST=${HOST_SERVER_ICLIENT}
+         - jsonStubHeaders=${jsonStubHeadersIClient}
         ports:
          - "8081:80"
         volumes:

package.json

@@ -37,6 +37,7 @@
   },
   "scripts": {
     "test": "jest",
+    "build": "webpack",
     "webpack": "webpack -w",
     "serve": "http-server -o -c 1 -p 80",
     "dev": "npm-run-all --parallel webpack serve",

tests/Create.Area.test.js

@@ -256,5 +256,50 @@ describe('Test Create Area', () => {
             }
         }, 0);
     });
+
+    it('Should return data on submit when first time using areas', (done) => {
+
+        let areaInput;
+        let areaSelected;
+        let Area = require('components/Area/Create/Area').default;
+        let mockAdapter = new MockAdapter(axios);
+        let component = mount(
+            <Area />,
+            { context }
+        );
+        let expected = {
+            _id : 'Test',
+            parent : '',
+        }
+
+        mockAdapter
+            .onGet(HOST + '/api/v1/area').reply(404, {error: "Not Found"})
+            .onPost(HOST + '/api/v1/area').reply(201)
+
+        setTimeout(() => {
+
+            try {
+
+                let inputs = {
+                    area : component.find('input'),
+                    parent : component.find('select'),
+                }
+
+                areaInput = component.find('input');
+                areaInput.node.value = 'Test';
+                areaInput.simulate('change', areaInput);
+
+                expect(component.find('.is-danger').text()).toEqual('Not Found');
+
+                component.find('form').simulate('submit', { target: component.find('form').get(0) });
+
+                expect(component.state().area).toEqual(expected);
+                expect(component.state().error).toEqual('');
+                done();
+            } catch (e) {
+                console.log(e);
+            }
+        }, 25);
+    });
 });
 

tests/List.Area.test.js

@@ -35,7 +35,7 @@ describe('Test Area', () => {
         setTimeout(() => {
             try {
                 component.update();
-                expect(component.render().text()).toEqual('Area Not Found');
+                expect(component.render().find('.is-danger').text()).toEqual('Area Not Found');
                 done();
             } catch (e) {
                 console.log(e);
@@ -62,7 +62,7 @@ describe('Test Area', () => {
         setTimeout(() => {
             try {
                 component.update();
-                expect(component.render().text()).toEqual('Error Found: Trying get area');
+                expect(component.render().find('.is-danger').text()).toEqual('Error Found: Trying get area');
                 done();
             } catch (e) {
                 console.log(e);