From bd55fab4dbbb16c0dd29b4110538f04ae8c42ac6 Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Thu, 21 Jun 2018 17:59:21 -0700 Subject: [PATCH] migrate usage of `parameterWithMeta` to `parameterWithMetaByIdentity` --- src/core/components/param-body.jsx | 4 ++-- src/core/components/parameter-row.jsx | 6 +++--- src/core/components/parameters.jsx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/components/param-body.jsx b/src/core/components/param-body.jsx index d1b556f6..20de5dc7 100644 --- a/src/core/components/param-body.jsx +++ b/src/core/components/param-body.jsx @@ -47,7 +47,7 @@ export default class ParamBody extends PureComponent { updateValues = (props) => { let { specSelectors, pathMethod, param, isExecute, consumesValue="" } = props - let parameter = (specSelectors ? specSelectors.parameterWithMeta(pathMethod, param.get("name"), param.get("in")) : fromJS({})) || param + let parameter = (specSelectors ? specSelectors.parameterWithMetaByIdentity(pathMethod, param) : fromJS({})) || param let isXml = /xml/i.test(consumesValue) let isJson = /json/i.test(consumesValue) let paramValue = isXml ? parameter.get("value_xml") : parameter.get("value") @@ -107,7 +107,7 @@ export default class ParamBody extends PureComponent { const HighlightCode = getComponent("highlightCode") const ContentType = getComponent("contentType") // for domains where specSelectors not passed - let parameter = specSelectors ? specSelectors.parameterWithMeta(pathMethod, param.get("name"), param.get("in")) : param + let parameter = specSelectors ? specSelectors.parameterWithMetaByIdentity(pathMethod, param) : param let errors = parameter.get("errors", List()) let consumesValue = specSelectors.contentTypeValues(pathMethod).get("requestContentType") let consumes = this.props.consumes && this.props.consumes.size ? this.props.consumes : ParamBody.defaultProp.consumes diff --git a/src/core/components/parameter-row.jsx b/src/core/components/parameter-row.jsx index 3ec47a55..fe3f9efd 100644 --- a/src/core/components/parameter-row.jsx +++ b/src/core/components/parameter-row.jsx @@ -30,7 +30,7 @@ export default class ParameterRow extends Component { let { isOAS3 } = specSelectors let example = param.get("example") - let parameter = specSelectors.parameterWithMeta(pathMethod, param.get("name"), param.get("in")) || param + let parameter = specSelectors.parameterWithMetaByIdentity(pathMethod, param) || param let enumValue if(isOAS3()) { @@ -72,7 +72,7 @@ export default class ParameterRow extends Component { let defaultValue = schema.get("default") let xExampleValue = param.get("x-example") // Swagger 2 only - let parameter = specSelectors.parameterWithMeta(pathMethod, param.get("name"), param.get("in")) + let parameter = specSelectors.parameterWithMetaByIdentity(pathMethod, param) let value = parameter ? parameter.get("value") : "" if( param.get("in") !== "body" ) { @@ -112,7 +112,7 @@ export default class ParameterRow extends Component { const Markdown = getComponent("Markdown") const ParameterExt = getComponent("ParameterExt") - let paramWithMeta = specSelectors.parameterWithMeta(pathMethod, param.get("name"), param.get("in")) + let paramWithMeta = specSelectors.parameterWithMetaByIdentity(pathMethod, param) let format = param.get("format") let schema = isOAS3 && isOAS3() ? param.get("schema") : param let type = schema.get("type") diff --git a/src/core/components/parameters.jsx b/src/core/components/parameters.jsx index 41c3a3c6..c3c079c7 100644 --- a/src/core/components/parameters.jsx +++ b/src/core/components/parameters.jsx @@ -101,7 +101,7 @@ export default class Parameters extends Component { specPath={specPath.push(i.toString())} getComponent={ getComponent } getConfigs={ getConfigs } - param={ specSelectors.parameterWithMeta(pathMethod, parameter.get("name"), parameter.get("in")) } + param={ specSelectors.parameterWithMetaByIdentity(pathMethod, parameter) } key={ `${parameter.get( "in" )}.${parameter.get("name")}` } onChange={ this.onChange } onChangeConsumes={this.onChangeConsumesWrapper}