From 050f4d1918ab9ec4c34d7b48672ce3b440ce7036 Mon Sep 17 00:00:00 2001
From: Owen Conti <owen@ohseemedia.com>
Date: Sun, 20 Aug 2017 17:02:51 -0600
Subject: [PATCH] Clean up OperationContainer props.

---
 src/core/components/operations.jsx         | 17 ++++++-------
 src/core/containers/OperationContainer.jsx | 29 +++++++++++-----------
 src/core/plugins/view/root-injects.js      |  2 +-
 src/core/system.js                         |  3 +--
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/core/components/operations.jsx b/src/core/components/operations.jsx
index 724c82f9..382960b7 100644
--- a/src/core/components/operations.jsx
+++ b/src/core/components/operations.jsx
@@ -29,14 +29,11 @@ export default class Operations extends React.Component {
 
     let taggedOps = specSelectors.taggedOperations()
 
-    const Operation = getComponent("OperationContainer", true)
+    const OperationContainer = getComponent("OperationContainer", true)
     const Collapse = getComponent("Collapse")
 
-    let showSummary = layoutSelectors.showSummary()
     let {
       docExpansion,
-      displayOperationId,
-      displayRequestDuration,
       maxDisplayedTags,
       deepLinking
     } = getConfigs()
@@ -114,13 +111,15 @@ export default class Operations extends React.Component {
                   <Collapse isOpened={showTag}>
                     {
                       operations.map( op => {
-                        return <Operation
-                          key={`${op.get("path")}-${op.get("method")}`}
+                        const path = op.get("path")
+                        const method = op.get("method")
+
+                        return <OperationContainer
+                          key={`${path}-${method}`}
                           op={op}
+                          path={path}
+                          method={method}
                           tag={tag}
-                          showSummary={showSummary}
-                          displayOperationId={displayOperationId}
-                          displayRequestDuration={displayRequestDuration}
 
                           specActions={ specActions }
                           specSelectors={ specSelectors }
diff --git a/src/core/containers/OperationContainer.jsx b/src/core/containers/OperationContainer.jsx
index 103bdcfd..5c7118ed 100644
--- a/src/core/containers/OperationContainer.jsx
+++ b/src/core/containers/OperationContainer.jsx
@@ -5,7 +5,7 @@ import { Iterable, fromJS } from "immutable"
 
 const { opId } = helpers
 
-export default class Operation extends PureComponent {
+export default class OperationContainer extends PureComponent {
   constructor(props, context) {
     super(props, context)
     this.state = {
@@ -50,27 +50,26 @@ export default class Operation extends PureComponent {
     displayRequestDuration: false
   }
 
-  static mapStateToProps(nextState, props) {
-    const { layoutSelectors, getConfigs } = props
-    const { docExpansion, deepLinking } = getConfigs()
-    const op = props.op
-    const path = op.get("path", "")
-    const method = op.get("method", "")
-    const operationId = op.getIn(["operation", "operationId"]) || op.getIn(["operation", "__originalOperationId"]) || opId(op.get("operation"), path, method) || op.get("id")
+  mapStateToProps(nextState, props) {
+    const { op, layoutSelectors, getConfigs } = props
+    const { docExpansion, deepLinking, displayOperationId, displayRequestDuration } = getConfigs()
+    const showSummary = layoutSelectors.showSummary()
+    const operationId = op.getIn(["operation", "operationId"]) || op.getIn(["operation", "__originalOperationId"]) || opId(op.get("operation"), props.path, props.method) || op.get("id")
     const isShownKey = fromJS(["operations", props.tag, operationId])
     const isDeepLinkingEnabled = deepLinking && deepLinking !== "false"
 
     return {
-      path,
-      method,
       operationId,
       isDeepLinkingEnabled,
+      isShownKey,
+      showSummary,
+      displayOperationId,
+      displayRequestDuration,
       isShown: layoutSelectors.isShown(isShownKey, docExpansion === "full" ),
-      jumpToKey: `paths.${path}.${method}`,
-      isShownKey: isShownKey,
-      allowTryItOut: props.specSelectors.allowTryItOutFor(op.get("path"), op.get("method")),
-      response: props.specSelectors.responseFor(op.get("path"), op.get("method")),
-      request: props.specSelectors.requestFor(op.get("path"), op.get("method"))
+      jumpToKey: `paths.${props.path}.${props.method}`,
+      allowTryItOut: props.specSelectors.allowTryItOutFor(props.path, props.method),
+      response: props.specSelectors.responseFor(props.path, props.method),
+      request: props.specSelectors.requestFor(props.path, props.method)
     }
   }
 
diff --git a/src/core/plugins/view/root-injects.js b/src/core/plugins/view/root-injects.js
index b916bee3..568ac6ac 100644
--- a/src/core/plugins/view/root-injects.js
+++ b/src/core/plugins/view/root-injects.js
@@ -20,7 +20,7 @@ const RootWrapper = (reduxStore, ComponentToWrap) => class extends Component {
 }
 
 const makeContainer = (getSystem, component, reduxStore) => {
-  const mapStateToProps = component.prototype.constructor.mapStateToProps || function(state) {
+  const mapStateToProps = component.prototype.mapStateToProps || function(state) {
     return {state}
   }
   let wrappedWithSystem = SystemWrapper(getSystem, component, reduxStore)
diff --git a/src/core/system.js b/src/core/system.js
index e4eee5b8..06071bc9 100644
--- a/src/core/system.js
+++ b/src/core/system.js
@@ -289,8 +289,7 @@ export default class Store {
 
   getMapStateToProps() {
     return () => {
-      let obj = Object.assign({}, this.getSystem())
-      return obj
+      return Object.assign({}, this.getSystem())
     }
   }