Now DialogsController is simpler too

Author: smashwilson

lib/controllers/dialogs-controller.js

@@ -1,13 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import Panel from '../atom/panel';
 import InitDialog from '../views/init-dialog';
 import CloneDialog from '../views/clone-dialog';
 import CredentialDialog from '../views/credential-dialog';
 import OpenIssueishDialog from '../views/open-issueish-dialog';
 import OpenCommitDialog from '../views/open-commit-dialog';
 
+const DIALOG_COMPONENTS = {
+  null: NullDialog,
+  init: InitDialog,
+  clone: CloneDialog,
+  credential: CredentialDialog,
+  issueish: OpenIssueishDialog,
+  commit: OpenCommitDialog,
+};
+
 export default class DialogsController extends React.Component {
   static propTypes = {
     // Model
@@ -22,58 +30,16 @@ export default class DialogsController extends React.Component {
     config: PropTypes.object.isRequired,
   };
 
-  constructor(props) {
-    super(props);
-
-    this.dialogRenderFns = {
-      null: () => null,
-      init: this.renderInitDialog,
-      clone: this.renderCloneDialog,
-      credential: this.renderCredentialDialog,
-      issueish: this.renderIssueishDialog,
-      commit: this.renderCommitDialog,
-    };
-
-    this.state = {
-      requestInProgress: null,
-      requestError: [null, null],
-    };
+  state = {
+    requestInProgress: null,
+    requestError: [null, null],
   }
 
   render() {
-    return this.dialogRenderFns[this.props.request.identifier]();
+    const DialogComponent = DIALOG_COMPONENTS[this.props.request.identifier];
+    return <DialogComponent {...this.getCommonProps()} />;
   }
 
-  renderInitDialog = () => (
-    <Panel workspace={this.props.workspace} location="modal">
-      <InitDialog {...this.getCommonProps()} />
-    </Panel>
-  )
-
-  renderCloneDialog = () => (
-    <Panel workspace={this.props.workspace} location="modal">
-      <CloneDialog config={this.props.config} {...this.getCommonProps()} />
-    </Panel>
-  )
-
-  renderCredentialDialog = () => (
-    <Panel workspace={this.props.workspace} location="modal">
-      <CredentialDialog {...this.getCommonProps()} />
-    </Panel>
-  )
-
-  renderIssueishDialog = () => (
-    <Panel workspace={this.props.workspace} location="modal">
-      <OpenIssueishDialog {...this.getCommonProps()} />
-    </Panel>
-  )
-
-  renderCommitDialog = () => (
-    <Panel workspace={this.props.workspace} location="modal">
-      <OpenCommitDialog {...this.getCommonProps()} />
-    </Panel>
-  )
-
   getCommonProps() {
     const {request} = this.props;
     const accept = request.isProgressing
@@ -99,14 +65,20 @@ export default class DialogsController extends React.Component {
     const wrapped = wrapDialogRequest(request, {accept});
 
     return {
+      config: this.props.config,
       commands: this.props.commands,
+      workspace: this.props.workspace,
       inProgress: this.state.requestInProgress === request,
       error: this.state.requestError[0] === request ? this.state.requestError[1] : null,
       request: wrapped,
     };
   }
 }
 
+function NullDialog() {
+  return null;
+}
+
 class DialogRequest {
   constructor(identifier, params = {}) {
     this.identifier = identifier;
@@ -135,7 +107,7 @@ class DialogRequest {
 }
 
 function wrapDialogRequest(original, {accept}) {
-  const dup = new DialogRequest(original.identifier, original.getParams());
+  const dup = new DialogRequest(original.identifier, original.params);
   dup.isProgressing = original.isProgressing;
   dup.onAccept(accept);
   dup.onCancel(original.cancel);

test/controllers/dialogs-controller.test.js

@@ -30,18 +30,14 @@ describe('DialogsController', function() {
     const wrapper = shallow(buildApp({
       request: dialogRequests.null,
     }));
-    assert.isTrue(wrapper.isEmptyRender());
+    assert.isTrue(wrapper.exists('NullDialog'));
   });
 
   it('renders a chosen dialog when the appropriate DialogRequest is provided', function() {
     const wrapper = shallow(buildApp({
       request: dialogRequests.init({dirPath: __dirname}),
     }));
-
-    const panel = wrapper.find('Panel');
-    assert.strictEqual(panel.prop('location'), 'modal');
-    assert.strictEqual(panel.prop('workspace'), atomEnv.workspace);
-    assert.isTrue(panel.exists('InitDialog'));
+    assert.isTrue(wrapper.exists('InitDialog'));
   });
 
   it('passes inProgress to the dialog when the accept callback is asynchronous', async function() {