Make sure we display the correct back button for folder forms

client/src/containers/Editor/Editor.js

@@ -211,7 +211,7 @@ class Editor extends Component {
     const schemaUrl = this.getFormSchemaUrl();
 
     let showButton = buttonStates.SWITCH;
-    if (dialog) {
+    if (dialog && file && file.type !== 'folder') {
       // When editing the details of a file from inside the modal, we always show the back button
       // Otherwise, we only show theb ack button in mobile view to allow deselection of file
       showButton = showingSubForm ? buttonStates.ALWAYS_BACK : buttonStates.ONLY_BACK;

client/src/containers/Editor/tests/Editor-test.js

@@ -22,6 +22,9 @@ const render = (props) => {
         stashFormValues: jest.fn(),
       }
     },
+    file: {
+      type: 'image'
+    },
     ...props
   };
   const component = ReactTestUtils.renderIntoDocument(<Editor {...baseProps} />);
@@ -121,6 +124,23 @@ describe('Editor', () => {
       expect(connectedHeader.props.children.type).toBe('div');
       expect(connectedHeader.props.showButton).toBe(buttonStates.ALWAYS_BACK);
     });
+
+    it('Form for folder', () => {
+      const { component } =
+        render({ nextType: 'subform', dialog: true, file: { type: 'folder' } });
+
+      component.openModal();
+      const connectedHeader = component.editorHeader({
+        SchemaComponent: 'div',
+        formid: 'myFormName'
+      });
+
+      expect(connectedHeader.type.name).toBe('EditorHeader');
+      expect(connectedHeader.props.onDetails).toBeFalsy();
+      expect(connectedHeader.props.onCancel).toBe(component.handleClose);
+      expect(connectedHeader.props.children.type).toBe('div');
+      expect(connectedHeader.props.showButton).toBe(buttonStates.SWITCH);
+    });
   });
 
   describe('createFn', () => {