From 79ddae152683b3a148d7dec6d16bbddf475822f7 Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Fri, 27 Oct 2017 22:23:11 -0700 Subject: [PATCH 1/2] Pass correct schema values to parameter state builder for OAS3 --- src/core/components/parameter-row.jsx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/core/components/parameter-row.jsx b/src/core/components/parameter-row.jsx index 568d532e..8c1fd091 100644 --- a/src/core/components/parameter-row.jsx +++ b/src/core/components/parameter-row.jsx @@ -1,4 +1,5 @@ import React, { Component } from "react" +import { Map } from "immutable" import PropTypes from "prop-types" import win from "core/window" @@ -29,11 +30,23 @@ export default class ParameterRow extends Component { componentWillReceiveProps(props) { let { specSelectors, pathMethod, param } = props + let { isOAS3 } = specSelectors + let example = param.get("example") let defaultValue = param.get("default") let parameter = specSelectors.getParameter(pathMethod, param.get("name"), param.get("in")) - let paramValue = parameter ? parameter.get("value") : undefined - let enumValue = parameter ? parameter.get("enum") : undefined + let paramValue + let enumValue + + if(isOAS3()) { + let schema = param.get("schema") || Map() + paramValue = schema.get("value") + enumValue = schema.get("enum") + } else { + paramValue = parameter ? parameter.get("value") : undefined + enumValue = parameter ? parameter.get("enum") : undefined + } + let value if ( paramValue !== undefined ) { From 215798821225a283b231cadf6898bafb7ce9b12c Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Fri, 27 Oct 2017 23:31:47 -0700 Subject: [PATCH 2/2] Don't reach into schema for value --- src/core/components/parameter-row.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/components/parameter-row.jsx b/src/core/components/parameter-row.jsx index 8c1fd091..71a2765a 100644 --- a/src/core/components/parameter-row.jsx +++ b/src/core/components/parameter-row.jsx @@ -35,17 +35,15 @@ export default class ParameterRow extends Component { let example = param.get("example") let defaultValue = param.get("default") let parameter = specSelectors.getParameter(pathMethod, param.get("name"), param.get("in")) - let paramValue let enumValue if(isOAS3()) { let schema = param.get("schema") || Map() - paramValue = schema.get("value") enumValue = schema.get("enum") } else { - paramValue = parameter ? parameter.get("value") : undefined enumValue = parameter ? parameter.get("enum") : undefined } + let paramValue = parameter ? parameter.get("value") : undefined let value