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

fix(oas31): fix extendable behavior in OpenAPI 3.1 base dialect keywords (#8660)

Browse Source 
This change is related to JSON Schema 2020-12.

Refs #8513
This commit is contained in:
Vladimír Gorej
2023-05-12 13:01:31 +02:00
committed by GitHub
parent 01d2376b5f
commit 36148cbb50
3 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Discriminator/Discriminator.jsx
View File

@@ -12,6 +12,7 @@ const Discriminator = ({ schema, getSystem }) => {
const { fn, getComponent } = getSystem()
const { useIsExpandedDeeply, useComponent } = fn.jsonSchema202012
const isExpandedDeeply = useIsExpandedDeeply()
const isExpandable = !!discriminator.mapping
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
const Accordion = useComponent("Accordion")
@@ -41,12 +42,24 @@ const Discriminator = ({ schema, getSystem }) => {
return (
<JSONSchemaDeepExpansionContext.Provider value={expandedDeeply}>
<div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--discriminator">
{isExpandable ? (
<>
<Accordion expanded={expanded} onChange={handleExpansion}>
<span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
Discriminator
</span>
</Accordion>
<ExpandDeepButton expanded={expanded} onClick={handleExpansionDeep} />
<ExpandDeepButton
expanded={expanded}
onClick={handleExpansionDeep}
/>
</>
) : (
<span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
Discriminator
</span>
)}
{discriminator.propertyName && (
<span className="json-schema-2020-12__attribute json-schema-2020-12__attribute--muted">
{discriminator.propertyName}

14
src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/ExternalDocs.jsx
View File

@@ -12,6 +12,7 @@ const ExternalDocs = ({ schema, getSystem }) => {
const { fn, getComponent } = getSystem()
const { useIsExpandedDeeply, useComponent } = fn.jsonSchema202012
const isExpandedDeeply = useIsExpandedDeeply()
const isExpandable = !!(externalDocs.description || externalDocs.url)
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
const Accordion = useComponent("Accordion")
@@ -43,12 +44,23 @@ const ExternalDocs = ({ schema, getSystem }) => {
return (
<JSONSchemaDeepExpansionContext.Provider value={expandedDeeply}>
<div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--externalDocs">
{isExpandable ? (
<>
<Accordion expanded={expanded} onChange={handleExpansion}>
<span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
External documentation
</span>
</Accordion>
<ExpandDeepButton expanded={expanded} onClick={handleExpansionDeep} />
<ExpandDeepButton
expanded={expanded}
onClick={handleExpansionDeep}
/>
</>
) : (
<span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
External documentation
</span>
)}
<strong className="json-schema-2020-12__attribute json-schema-2020-12__attribute--primary">
object
</strong>

14
src/core/plugins/oas31/json-schema-2020-12-extensions/components/keywords/Xml.jsx
View File

@@ -10,6 +10,7 @@ const Xml = ({ schema, getSystem }) => {
const { fn, getComponent } = getSystem()
const { useIsExpandedDeeply, useComponent } = fn.jsonSchema202012
const isExpandedDeeply = useIsExpandedDeeply()
const isExpandable = !!(xml.name || xml.namespace || xml.prefix)
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
const Accordion = useComponent("Accordion")
@@ -39,12 +40,23 @@ const Xml = ({ schema, getSystem }) => {
return (
<JSONSchemaDeepExpansionContext.Provider value={expandedDeeply}>
<div className="json-schema-2020-12-keyword json-schema-2020-12-keyword--xml">
{isExpandable ? (
<>
<Accordion expanded={expanded} onChange={handleExpansion}>
<span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
XML
</span>
</Accordion>
<ExpandDeepButton expanded={expanded} onClick={handleExpansionDeep} />
<ExpandDeepButton
expanded={expanded}
onClick={handleExpansionDeep}
/>
</>
) : (
<span className="json-schema-2020-12-keyword__name json-schema-2020-12-keyword__name--secondary">
XML
</span>
)}
{xml.attribute === true && (
<span className="json-schema-2020-12__attribute json-schema-2020-12__attribute--muted">
attribute