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

feat(json-schema-2020-12): add support for anyOf keyword

Browse Source 
Refs #8513
This commit is contained in:
Vladimir Gorej
2023-04-21 08:30:14 +02:00
committed by Vladimír Gorej
parent f41c6ba0d7
commit ff2d4b2311
8 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/plugins/json-schema-2020-12/components/JSONSchema/JSONSchema.jsx
View File

@@ -42,6 +42,7 @@ const JSONSchema = ({ schema, name }) => {
const Keyword$defs = useComponent("Keyword$defs")
const Keyword$comment = useComponent("Keyword$comment")
const KeywordAllOf = useComponent("KeywordAllOf")
const KeywordAnyOf = useComponent("KeywordAnyOf")
const KeywordProperties = useComponent("KeywordProperties")
const KeywordType = useComponent("KeywordType")
const KeywordFormat = useComponent("KeywordFormat")
@@ -107,6 +108,7 @@ const JSONSchema = ({ schema, name }) => {
<KeywordProperties schema={schema} />
)}
<KeywordAllOf schema={schema} />
<KeywordAnyOf schema={schema} />
<Keyword$schema schema={schema} />
<Keyword$vocabulary schema={schema} />
<Keyword$id schema={schema} />

1
src/core/plugins/json-schema-2020-12/components/_all.scss
View File

@@ -9,6 +9,7 @@
@import './keywords/$vocabulary/$vocabulary';
@import './keywords/$defs/$defs';
@import './keywords/AllOf/all-of';
@import './keywords/AnyOf/any-of';
@import './keywords/Type/type';
@import './keywords/Format/format';
@import './keywords/Description/description';

56
src/core/plugins/json-schema-2020-12/components/keywords/AnyOf/AnyOf.jsx Normal file
View File

@@ -0,0 +1,56 @@
/**
* @prettier
*/
import React, { useCallback, useState } from "react"
import { schema } from "../../../prop-types"
import { useFn, useComponent, useIsExpandedDeeply } from "../../../hooks"
const AnyOf = ({ schema }) => {
const anyOf = schema?.anyOf || []
if (!Array.isArray(anyOf) || anyOf.length === 0) {
return null
}
const fn = useFn()
const isExpandedDeeply = useIsExpandedDeeply()
const [expanded, setExpanded] = useState(isExpandedDeeply)
const Accordion = useComponent("Accordion")
const JSONSchema = useComponent("JSONSchema")
const handleExpansion = useCallback(() => {
setExpanded((prev) => !prev)
}, [])
return (
<div className="json-schema-2020-12__anyOf">
<Accordion expanded={expanded} onChange={handleExpansion}>
<span className="json-schema-2020-12-core-keyword json-schema-2020-12-core-keyword--anyOf">
AnyOf
</span>
<span className="json-schema-2020-12__type">
{fn.getType({ anyOf })}
</span>
</Accordion>
{expanded && (
<ul>
{anyOf.map((schema, index) => (
<li key={`#${index}`} className="json-schema-2020-12-property">
<JSONSchema
name={`#${index} ${fn.getTitle(schema)}`}
schema={schema}
/>
</li>
))}
</ul>
)}
</div>
)
}
AnyOf.propTypes = {
schema: schema.isRequired,
}
export default AnyOf

19
src/core/plugins/json-schema-2020-12/components/keywords/AnyOf/_any-of.scss Normal file
View File

@@ -0,0 +1,19 @@
.json-schema-2020-12 {
&__anyOf {
margin: 5px 0 5px 0;
& > ul {
@include expansion-border;
padding: 0;
}
}
&-core-keyword {
&--anyOf {
color: $text-code-default-font-color;
font-style: normal;
}
}
}

1
src/core/plugins/json-schema-2020-12/fn.js
View File

@@ -123,6 +123,7 @@ export const isExpandable = (schema) => {
schema?.$defs ||
schema?.$comment ||
schema?.allOf ||
schema?.anyOf ||
schema?.description ||
schema?.properties
)

2
src/core/plugins/json-schema-2020-12/hoc.jsx
View File

@@ -14,6 +14,7 @@ import Keyword$dynamicRef from "./components/keywords/$dynamicRef"
import Keyword$defs from "./components/keywords/$defs/$defs"
import Keyword$comment from "./components/keywords/$comment"
import KeywordAllOf from "./components/keywords/AllOf/AllOf"
import KeywordAnyOf from "./components/keywords/AnyOf/AnyOf"
import KeywordProperties from "./components/keywords/Properties/Properties"
import KeywordType from "./components/keywords/Type/Type"
import KeywordFormat from "./components/keywords/Format/Format"
@@ -45,6 +46,7 @@ export const withJSONSchemaContext = (Component, overrides = {}) => {
Keyword$defs,
Keyword$comment,
KeywordAllOf,
KeywordAnyOf,
KeywordProperties,
KeywordType,
KeywordFormat,

2
src/core/plugins/json-schema-2020-12/index.js
View File

@@ -13,6 +13,7 @@ import Keyword$dynamicRef from "./components/keywords/$dynamicRef"
import Keyword$defs from "./components/keywords/$defs/$defs"
import Keyword$comment from "./components/keywords/$comment"
import KeywordAllOf from "./components/keywords/AllOf/AllOf"
import KeywordAnyOf from "./components/keywords/AnyOf/AnyOf"
import KeywordType from "./components/keywords/Type/Type"
import KeywordFormat from "./components/keywords/Format/Format"
import KeywordTitle from "./components/keywords/Title/Title"
@@ -36,6 +37,7 @@ const JSONSchema202012Plugin = () => ({
JSONSchema202012Keyword$defs: Keyword$defs,
JSONSchema202012Keyword$comment: Keyword$comment,
JSONSchema202012KeywordAllOf: KeywordAllOf,
JSONSchema202012KeywordAnyOf: KeywordAnyOf,
JSONSchema202012KeywordProperties: KeywordProperties,
JSONSchema202012KeywordType: KeywordType,
JSONSchema202012KeywordFormat: KeywordFormat,

2
src/core/plugins/oas31/wrap-components/models.jsx
View File

@@ -21,6 +21,7 @@ const ModelsWrapper = createOnlyOAS31ComponentWrapper(({ getSystem }) => {
const Keyword$defs = getComponent("JSONSchema202012Keyword$defs")
const Keyword$comment = getComponent("JSONSchema202012Keyword$comment")
const KeywordAllOf = getComponent("JSONSchema202012KeywordAllOf")
const KeywordAnyOf = getComponent("JSONSchema202012KeywordAnyOf")
const KeywordProperties = getComponent("JSONSchema202012KeywordProperties")
const KeywordType = getComponent("JSONSchema202012KeywordType")
const KeywordFormat = getComponent("JSONSchema202012KeywordFormat")
@@ -50,6 +51,7 @@ const ModelsWrapper = createOnlyOAS31ComponentWrapper(({ getSystem }) => {
Keyword$defs,
Keyword$comment,
KeywordAllOf,
KeywordAnyOf,
KeywordProperties,
KeywordType,
KeywordFormat,