FIX Render Content component even if no summary is available

silverstripe · Oct 15, 2018 · 6e69ef9 · 6e69ef9
1 parent 5cbc6c7
commit 6e69ef9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/ElementEditor/Content.js b/client/src/components/ElementEditor/Content.js
@@ -33,13 +33,9 @@ class Content extends PureComponent {
       onFormInit
     } = this.props;
 
-    if (!content && !fileUrl) {
-      return null;
-    }
-
     return (
       <div className="element-editor-content">
-        {!previewExpanded &&
+        {!previewExpanded && (content || fileUrl) &&
           // Show summary
           <SummaryComponent
             content={content}

diff --git a/client/src/components/ElementEditor/tests/Content-test.js b/client/src/components/ElementEditor/tests/Content-test.js
@@ -45,7 +45,7 @@ describe('Content', () => {
       expect(wrapper.find(InlineEditFormComponent)).toHaveLength(1);
     });
 
-    it('returns null when no content or image is provided', () => {
+    it('returns a div when no content or image is provided', () => {
       const wrapper = shallow(
         <Content
           fileUrl=""
@@ -57,7 +57,8 @@ describe('Content', () => {
         />
       );
 
-      expect(wrapper.type()).toBeNull();
+      expect(wrapper.type()).toEqual('div');
+      expect(wrapper.find(SummaryComponent)).toHaveLength(0);
     });
   });
 });