fix: decode model schema name on model component (#8400)

Refs #5626
This commit is contained in:
Enzzo
2023-03-13 07:59:44 -03:00
committed by GitHub
parent c9d94066d4
commit 44e2700c74
2 changed files with 51 additions and 2 deletions

View File

@@ -3,6 +3,16 @@ import ImmutablePureComponent from "react-immutable-pure-component"
import ImPropTypes from "react-immutable-proptypes"
import PropTypes from "prop-types"
const decodeRefName = uri => {
const unescaped = uri.replace(/~1/g, "/").replace(/~0/g, "~")
try {
return decodeURIComponent(unescaped)
} catch {
return unescaped
}
}
export default class Model extends ImmutablePureComponent {
static propTypes = {
schema: ImPropTypes.map.isRequired,
@@ -22,10 +32,10 @@ export default class Model extends ImmutablePureComponent {
getModelName =( ref )=> {
if ( ref.indexOf("#/definitions/") !== -1 ) {
return ref.replace(/^.*#\/definitions\//, "")
return decodeRefName(ref.replace(/^.*#\/definitions\//, ""))
}
if ( ref.indexOf("#/components/schemas/") !== -1 ) {
return ref.replace(/^.*#\/components\/schemas\//, "")
return decodeRefName(ref.replace(/^.*#\/components\/schemas\//, ""))
}
}

View File

@@ -0,0 +1,39 @@
/**
* @prettier
*/
import Model from "../../../../src/core/components/model"
describe("getModelName", () => {
const model = new Model()
it("should decode JSON Pointer and URI encoding for OpenAPI v3 refs", () => {
const actual = model.getModelName("#/components/schemas/a~1b%2Bc")
const expected = "a/b+c"
expect(actual).toStrictEqual(expected)
})
it("should decode JSON Pointer and URI encoding for Swagger v2 refs", () => {
const actual = model.getModelName(
"#/definitions/custom%3A%3Anamespace%3A%3APerson"
)
const expected = "custom::namespace::Person"
expect(actual).toStrictEqual(expected)
})
it("should decode multiple json-pointer values", () => {
const actual = model.getModelName("#/components/schemas/~1~1~0~0")
const expected = "//~~"
expect(actual).toStrictEqual(expected)
})
it("should support invalid URI encoding", () => {
const actual = model.getModelName("#/components/schemas/%25%d")
const expected = "%25%d"
expect(actual).toStrictEqual(expected)
})
})