From beeb6b608e8abe619aad59880d9591ecee4bc8f8 Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Sat, 23 Sep 2017 10:51:32 -0700 Subject: [PATCH] Revert "Merge pull request #3516 from owenconti/bug/3511-query-formData-parameters" This reverts commit 6a7e9d2e8881bf34ae0edef714ebc0ed1762ffce, reversing changes made to eb01beedfa4d4b6a5a732f234548a22cce47be87. --- src/core/components/param-body.jsx | 4 ++-- src/core/components/parameter-row.jsx | 8 ++------ src/core/components/parameters.jsx | 4 ++-- src/core/plugins/oas3/wrap-components/parameters.jsx | 2 +- src/core/plugins/spec/actions.js | 5 +++-- src/core/plugins/spec/reducers.js | 5 ++--- src/core/plugins/spec/selectors.js | 6 +++--- test/core/plugins/spec/selectors.js | 8 ++++---- 8 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/core/components/param-body.jsx b/src/core/components/param-body.jsx index 980ef490..48373f5f 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.getParameter(pathMethod, param.get("name"), param.get("in")) : {} + let parameter = specSelectors ? specSelectors.getParameter(pathMethod, param.get("name")) : {} 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.getParameter(pathMethod, param.get("name"), param.get("in")) : param + let parameter = specSelectors ? specSelectors.getParameter(pathMethod, param.get("name")) : 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 6799af30..456a8e63 100644 --- a/src/core/components/parameter-row.jsx +++ b/src/core/components/parameter-row.jsx @@ -19,17 +19,13 @@ export default class ParameterRow extends Component { let { specSelectors, pathMethod, param } = props let defaultValue = param.get("default") - let parameter = specSelectors.getParameter(pathMethod, param.get("name"), param.get("in")) + let parameter = specSelectors.getParameter(pathMethod, param.get("name")) let value = parameter ? parameter.get("value") : "" if ( defaultValue !== undefined && value === undefined ) { this.onChangeWrapper(defaultValue) } } - shouldComponentUpdate(nextProps) { - return nextProps.param !== this.props.param - } - componentWillReceiveProps(props) { let { specSelectors, pathMethod, param } = props let example = param.get("example") @@ -90,7 +86,7 @@ export default class ParameterRow extends Component { let isFormDataSupported = "FormData" in win let required = param.get("required") let itemType = param.getIn(isOAS3 && isOAS3() ? ["schema", "items", "type"] : ["items", "type"]) - let parameter = specSelectors.getParameter(pathMethod, param.get("name"), param.get("in")) + let parameter = specSelectors.getParameter(pathMethod, param.get("name")) let value = parameter ? parameter.get("value") : "" return ( diff --git a/src/core/components/parameters.jsx b/src/core/components/parameters.jsx index eff94f65..a6b981e6 100644 --- a/src/core/components/parameters.jsx +++ b/src/core/components/parameters.jsx @@ -37,7 +37,7 @@ export default class Parameters extends Component { onChangeKey, } = this.props - changeParam( onChangeKey, param.get("name"), param.get("in"), value, isXml) + changeParam( onChangeKey, param.get("name"), value, isXml) } onChangeConsumesWrapper = ( val ) => { @@ -94,7 +94,7 @@ export default class Parameters extends Component { { diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js index 31d942b9..98919880 100644 --- a/src/core/plugins/spec/actions.js +++ b/src/core/plugins/spec/actions.js @@ -130,10 +130,10 @@ export const formatIntoYaml = () => ({specActions, specSelectors}) => { } } -export function changeParam( path, paramName, paramIn, value, isXml ){ +export function changeParam( path, paramName, value, isXml ){ return { type: UPDATE_PARAM, - payload:{ path, value, paramName, paramIn, isXml } + payload:{ path, value, paramName, isXml } } } @@ -206,6 +206,7 @@ export const executeRequest = (req) => // if url is relative, parseUrl makes it absolute by inferring from `window.location` req.contextUrl = parseUrl(specSelectors.url()).toString() + if(op && op.operationId) { req.operationId = op.operationId } else if(op && pathName && method) { diff --git a/src/core/plugins/spec/reducers.js b/src/core/plugins/spec/reducers.js index 0c436183..e76c2d6a 100644 --- a/src/core/plugins/spec/reducers.js +++ b/src/core/plugins/spec/reducers.js @@ -40,10 +40,9 @@ export default { }, [UPDATE_PARAM]: ( state, {payload} ) => { - let { path, paramName, paramIn, value, isXml } = payload - + let { path, paramName, value, isXml } = payload return state.updateIn( [ "resolved", "paths", ...path, "parameters" ], fromJS([]), parameters => { - const index = parameters.findIndex(p => p.get( "name" ) === paramName && p.get("in") === paramIn ) + const index = parameters.findIndex(p => p.get( "name" ) === paramName ) if (!(value instanceof win.File)) { value = fromJSOrdered( value ) } diff --git a/src/core/plugins/spec/selectors.js b/src/core/plugins/spec/selectors.js index 7628c52a..a92ef4b3 100644 --- a/src/core/plugins/spec/selectors.js +++ b/src/core/plugins/spec/selectors.js @@ -260,10 +260,10 @@ export const allowTryItOutFor = () => { } // Get the parameter value by parameter name -export function getParameter(state, pathMethod, name, inType) { +export function getParameter(state, pathMethod, name) { let params = spec(state).getIn(["paths", ...pathMethod, "parameters"], fromJS([])) return params.filter( (p) => { - return Map.isMap(p) && p.get("name") === name && p.get("in") === inType + return Map.isMap(p) && p.get("name") === name }).first() } @@ -280,7 +280,7 @@ export function parameterValues(state, pathMethod, isXml) { let params = spec(state).getIn(["paths", ...pathMethod, "parameters"], fromJS([])) return params.reduce( (hash, p) => { let value = isXml && p.get("in") === "body" ? p.get("value_xml") : p.get("value") - return hash.set(`${p.get("in")}.${p.get("name")}`, value) + return hash.set(p.get("name"), value) }, fromJS({})) } diff --git a/test/core/plugins/spec/selectors.js b/test/core/plugins/spec/selectors.js index df6b1c21..7519a42e 100644 --- a/test/core/plugins/spec/selectors.js +++ b/test/core/plugins/spec/selectors.js @@ -29,8 +29,8 @@ describe("spec plugin - selectors", function(){ "/one": { get: { parameters: [ - { name: "one", in: "query", value: 1}, - { name: "two", in: "query", value: "duos"} + { name: "one", value: 1}, + { name: "two", value: "duos"} ] } } @@ -43,8 +43,8 @@ describe("spec plugin - selectors", function(){ // Then expect(paramValues.toJS()).toEqual({ - "query.one": 1, - "query.two": "duos" + one: 1, + two: "duos" }) })