fix(json-schema-2020-12): handle boolean schemas properly

Refs #8513
swagger-api · Apr 26, 2023 · 66d5503 · 66d5503
1 parent a9dc6b0
commit 66d5503
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/Contains.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/Contains.jsx
@@ -7,7 +7,7 @@ import { schema } from "../../prop-types"
 import { useComponent } from "../../hooks"
 
 const Contains = ({ schema }) => {
-  if (!schema?.contains) return null
+  if (!Object.hasOwn(schema, "contains")) return null
 
   const JSONSchema = useComponent("JSONSchema")
   const name = (

diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/Else.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/Else.jsx
@@ -7,7 +7,7 @@ import { schema } from "../../prop-types"
 import { useComponent } from "../../hooks"
 
 const Else = ({ schema }) => {
-  if (!schema?.else) return null
+  if (!Object.hasOwn(schema, "contains")) return null
 
   const JSONSchema = useComponent("JSONSchema")
   const name = (

diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/If.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/If.jsx
@@ -7,7 +7,7 @@ import { schema } from "../../prop-types"
 import { useComponent } from "../../hooks"
 
 const If = ({ schema }) => {
-  if (!schema?.if) return null
+  if (!Object.hasOwn(schema, "if")) return null
 
   const JSONSchema = useComponent("JSONSchema")
   const name = (

diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/Not.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/Not.jsx
@@ -7,7 +7,7 @@ import { schema } from "../../prop-types"
 import { useComponent } from "../../hooks"
 
 const Not = ({ schema }) => {
-  if (!schema?.not) return null
+  if (!Object.hasOwn(schema, "contains")) return null
 
   const JSONSchema = useComponent("JSONSchema")
   const name = (

diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/Then.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/Then.jsx
@@ -7,7 +7,7 @@ import { schema } from "../../prop-types"
 import { useComponent } from "../../hooks"
 
 const Then = ({ schema }) => {
-  if (!schema?.then) return null
+  if (!Object.hasOwn(schema, "then")) return null
 
   const JSONSchema = useComponent("JSONSchema")
   const name = (

diff --git a/src/core/plugins/json-schema-2020-12/fn.js b/src/core/plugins/json-schema-2020-12/fn.js
@@ -136,14 +136,14 @@ export const isExpandable = (schema) => {
     schema?.allOf ||
     schema?.anyOf ||
     schema?.oneOf ||
-    schema?.not ||
-    schema?.if ||
-    schema?.then ||
-    schema?.else ||
+    Object.hasOwn(schema, "not") ||
+    Object.hasOwn(schema, "if") ||
+    Object.hasOwn(schema, "then") ||
+    Object.hasOwn(schema, "else") ||
     schema?.dependentSchemas ||
     schema?.prefixItems ||
     schema?.items ||
-    schema?.contains ||
+    Object.hasOwn(schema, "contains") ||
     schema?.properties ||
     schema?.patternProperties ||
     schema?.description