Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle structure difference #8231

Merged
merged 5 commits into from
Oct 25, 2022
Merged

Handle structure difference #8231

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6033d59
Handle structure difference
ishuen Oct 14, 2022
f405e96
Change parameter with empty map
ishuen Oct 22, 2022
39c7a73
Change allowValues data type
ishuen Oct 24, 2022
f1e6c9f
Change to spread array shorthand
ishuen Oct 25, 2022
ff92b16
Merge branch 'master' into bug/8218-fix-boolean-and-enum-rendering
tim-lai Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/core/json-schema-components.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class JsonSchema_string extends Component {
const Select = getComponent("Select")
return (<Select className={ errors.length ? "invalid" : ""}
title={ errors.length ? errors : ""}
allowedValues={ enumValue }
allowedValues={ Array(...enumValue) }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prefer spread array shorthand

Suggested change
allowedValues={ Array(...enumValue) }
allowedValues={ [...enumValue] }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks.

value={ value }
allowEmptyValue={ !required }
disabled={disabled}
Expand Down Expand Up @@ -335,14 +335,14 @@ export class JsonSchema_boolean extends Component {
errors = errors.toJS ? errors.toJS() : []
let enumValue = schema && schema.get ? schema.get("enum") : null
let allowEmptyValue = !enumValue || !required
let booleanValue = !enumValue && fromJS(["true", "false"])
let booleanValue = !enumValue && ["true", "false"]
const Select = getComponent("Select")

return (<Select className={ errors.length ? "invalid" : ""}
title={ errors.length ? errors : ""}
value={ String(value) }
disabled={ disabled }
allowedValues={ enumValue || booleanValue }
allowedValues={ enumValue ? Array(...enumValue) : booleanValue }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prefer spread array shorthand

Suggested change
allowedValues={ enumValue ? Array(...enumValue) : booleanValue }
allowedValues={ enumValue ? [...enumValue] : booleanValue }

allowEmptyValue={ allowEmptyValue }
onChange={ this.onEnumChange }/>)
}
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/get-parameter-schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default function getParameterSchema(parameter, { isOAS3 } = {}) {
}

return {
schema: parameter.get("schema", Im.Map()),
schema: parameter.get("schema") ? parameter.get("schema", Im.Map()): Im.Map(),
parameterContentMediaType: null,
}
}
32 changes: 32 additions & 0 deletions test/unit/components/parameter-row.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,21 @@ describe("<ParameterRow/>", () => {
expect(wrapper.find(".parameter__type").text()).toEqual("string")
})

it("Can render Swagger 2 parameter type boolean without format", () => {
const param = fromJS({
name: "hasId",
in: "path",
description: "boolean value to indicate if the pet has an id",
type: "boolean"
})

const props = createProps({ param, isOAS3: false })
const wrapper = render(<ParameterRow {...props}/>)

expect(wrapper.find(".parameter__type").length).toEqual(1)
expect(wrapper.find(".parameter__type").text()).toEqual("boolean")
})

it("Can render OAS3 parameter type with format", () => {
const param = fromJS({
name: "petUuid",
Expand Down Expand Up @@ -83,6 +98,23 @@ describe("<ParameterRow/>", () => {
expect(wrapper.find(".parameter__type").length).toEqual(1)
expect(wrapper.find(".parameter__type").text()).toEqual("string")
})

it("Can render OAS3 parameter type boolean without format", () => {
const param = fromJS({
name: "hasId",
in: "path",
description: "boolean value to indicate if the pet has an id",
schema: {
type: "boolean"
}
})

const props = createProps({ param, isOAS3: true })
const wrapper = render(<ParameterRow {...props}/>)

expect(wrapper.find(".parameter__type").length).toEqual(1)
expect(wrapper.find(".parameter__type").text()).toEqual("boolean")
})
})

describe("bug #5573: zero default and example values", function () {
Expand Down