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

fix: safeguard Models from non-object schema content (via #4868)

Browse Source
This commit is contained in:
kyle
2018-09-11 18:22:22 -07:00
committed by GitHub
parent 1c52a9c77b
commit e28c502a22
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/components/models.jsx
View File

@@ -1,5 +1,5 @@
import React, { Component } from "react" import React, { Component } from "react"
import Im from "immutable" import Im, { Map } from "immutable"
import PropTypes from "prop-types" import PropTypes from "prop-types"
export default class Models extends Component { export default class Models extends Component {
@@ -55,8 +55,13 @@ export default class Models extends Component {
definitions.entrySeq().map(([name])=>{ definitions.entrySeq().map(([name])=>{
const fullPath = [...specPathBase, name] const fullPath = [...specPathBase, name]
const schema = specSelectors.specResolvedSubtree(fullPath)|| Im.Map()
const rawSchema = specSelectors.specJson().getIn(fullPath, Im.Map()) const schemaValue = specSelectors.specResolvedSubtree(fullPath)
const rawSchemaValue = specSelectors.specJson().getIn(fullPath)
const schema = Map.isMap(schemaValue) ? schemaValue : Im.Map()
const rawSchema = Map.isMap(rawSchemaValue) ? rawSchemaValue : Im.Map()
const displayName = schema.get("title") || rawSchema.get("title") || name const displayName = schema.get("title") || rawSchema.get("title") || name
if(layoutSelectors.isShown(["models", name], false) && (schema.size === 0 && rawSchema.size > 0)) { if(layoutSelectors.isShown(["models", name], false) && (schema.size === 0 && rawSchema.size > 0)) {