Skip to content

Commit f2a8905

Browse files
sserratadsuket
authored andcommitted
Add allOf required spec and fix items branch (PaloAltoNetworks#1190)
* Add allOf required spec and fix items branch * Place allOfRequired example in allOf category * move test to allOf * Remove duplicate allOfRequired spec
1 parent 0379503 commit f2a8905

2 files changed

Lines changed: 47 additions & 6 deletions

File tree

demo/examples/tests/allOf.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,51 @@ paths:
367367
otherOuterProp:
368368
type: string
369369

370+
/allof-parent-required:
371+
get:
372+
tags:
373+
- allOf
374+
summary: allOf inherits parent required
375+
description: |
376+
Parent object marks the "pet" property as required while its schema is composed via allOf.
377+
378+
Schema:
379+
```yaml
380+
type: object
381+
properties:
382+
pet:
383+
allOf:
384+
- type: object
385+
properties:
386+
name:
387+
type: string
388+
- type: object
389+
properties:
390+
age:
391+
type: integer
392+
required: [pet]
393+
```
394+
responses:
395+
"200":
396+
description: Successful response
397+
content:
398+
application/json:
399+
schema:
400+
type: object
401+
properties:
402+
pet:
403+
allOf:
404+
- type: object
405+
properties:
406+
name:
407+
type: string
408+
- type: object
409+
properties:
410+
age:
411+
type: integer
412+
required:
413+
- pet
414+
370415
/allof-nested-array-items:
371416
get:
372417
tags:

packages/docusaurus-theme-openapi-docs/src/theme/Schema/index.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -738,9 +738,7 @@ const SchemaEdge: React.FC<SchemaEdgeProps> = ({
738738
name={name}
739739
schemaName={mergedSchemaName}
740740
required={
741-
Array.isArray(mergedSchemas.required)
742-
? mergedSchemas.required.includes(name)
743-
: mergedSchemas.required
741+
Array.isArray(required) ? required.includes(name) : required
744742
}
745743
nullable={mergedSchemas.nullable}
746744
schema={mergedSchemas}
@@ -755,9 +753,7 @@ const SchemaEdge: React.FC<SchemaEdgeProps> = ({
755753
name={name}
756754
schemaName={mergedSchemaName}
757755
required={
758-
Array.isArray(mergedSchemas.required)
759-
? mergedSchemas.required.includes(name)
760-
: mergedSchemas.required
756+
Array.isArray(required) ? required.includes(name) : required
761757
}
762758
nullable={mergedSchemas.nullable}
763759
schema={mergedSchemas}

0 commit comments

Comments
 (0)