kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improvement: add Schema/Model switching to ModelExample component (via #5080)

Browse Source
This commit is contained in:
kyle
2018-12-13 21:28:01 +01:00
committed by GitHub
parent 2ecbdc73c1
commit f5e179ac39
2 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/components/model-example.jsx
View File

@@ -44,13 +44,17 @@ export default class ModelExample extends React.Component {
let { defaultModelExpandDepth } = getConfigs() let { defaultModelExpandDepth } = getConfigs()
const ModelWrapper = getComponent("ModelWrapper") const ModelWrapper = getComponent("ModelWrapper")
let isOAS3 = specSelectors.isOAS3()
return <div> return <div>
<ul className="tab"> <ul className="tab">
<li className={ "tabitem" + ( this.state.activeTab === "example" ? " active" : "") }> <li className={ "tabitem" + ( this.state.activeTab === "example" ? " active" : "") }>
<a className="tablinks" data-name="example" onClick={ this.activeTab }>{isExecute ? "Edit Value" : "Example Value"}</a> <a className="tablinks" data-name="example" onClick={ this.activeTab }>{isExecute ? "Edit Value" : "Example Value"}</a>
</li> </li>
{ schema ? <li className={ "tabitem" + ( this.state.activeTab === "model" ? " active" : "") }> { schema ? <li className={ "tabitem" + ( this.state.activeTab === "model" ? " active" : "") }>
<a className={ "tablinks" + ( isExecute ? " inactive" : "" )} data-name="model" onClick={ this.activeTab }>Model</a> <a className={ "tablinks" + ( isExecute ? " inactive" : "" )} data-name="model" onClick={ this.activeTab }>
{isOAS3 ? "Schema" : "Model" }
</a>
</li> : null } </li> : null }
</ul> </ul>
<div> <div>

23
test/e2e-cypress/tests/bugs/swos-63.js
View File

@@ -1,4 +1,5 @@
describe("SWOS-63: Schema/Model section labeling", () => { describe("SWOS-63: Schema/Model labeling", () => {
describe("SchemaS/Models section", () => {
it("should render `Schemas` for OpenAPI 3", () => { it("should render `Schemas` for OpenAPI 3", () => {
cy cy
.visit("/?url=/documents/petstore-expanded.openapi.yaml") .visit("/?url=/documents/petstore-expanded.openapi.yaml")
@@ -12,3 +13,23 @@ describe("SWOS-63: Schema/Model section labeling", () => {
.contains("Models") .contains("Models")
}) })
}) })
describe("ModelExample within Operation", () => {
it("should render `Schemas` for OpenAPI 3", () => {
cy
.visit("/?url=/documents/petstore-expanded.openapi.yaml")
.get("#operations-default-findPets")
.click()
.get("a.tablinks[data-name=model]")
.contains("Schema")
})
it("should render `Models` for OpenAPI 2", () => {
cy
.visit("/?url=/documents/petstore.swagger.yaml")
.get("section.models > h4")
.get("#operations-pet-addPet")
.click()
.get("a.tablinks[data-name=model]")
.contains("Model")
})
})
})