Merge 2d42b57 into 24aa115

eddyson-de · Dec 1, 2017 · 618615d · 618615d
2 parents 24aa115 + 2d42b57
commit 618615d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/lib/GridBuilder.js b/lib/GridBuilder.js
@@ -12,10 +12,9 @@ import PropTypes from 'prop-types';
 // configuration into the grid
 const withGridTemplate = (GridTemplate) => {
     const wrapper = (props) => {
-        const {children, columnConfigs, ...rest} = props;
-        const hasColumns = columnConfigs.filter(item=>!item.hide).length !== 0;
-        const hasObjects = props.objects.length !== 0;
-        const render = hasColumns || hasObjects;
+        const { children, columnConfigs, ...rest } = props;
+        const hasColumns = columnConfigs.some(item=>!item.hide);
+        const render = hasColumns;
 
         return(
             <div>

diff --git a/test/GridTest.js b/test/GridTest.js
@@ -207,13 +207,11 @@ describe('Grid render tests', function(){
 
   });
 
-  xit('Should not render anything if there are objects but no columns', function(){
+  it('Should not render anything if there are objects but no columns', function(){
     let grid = render(
       <Grid objects={data} hideColumnsWithoutConfig/>
     );
-    //TODO what should be rendered here?
     expect(grid.toString()).be.equal('<div></div>');
-
   });