From 6033d59981e3d367c5179c88ab314ff6e5a20ae7 Mon Sep 17 00:00:00 2001
From: ishuen <12228644+ishuen@users.noreply.github.com>
Date: Fri, 14 Oct 2022 23:21:27 +0800
Subject: [PATCH 1/4] Handle structure difference

---
 src/helpers/get-parameter-schema.js    |  2 +-
 test/unit/components/parameter-row.jsx | 30 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/helpers/get-parameter-schema.js b/src/helpers/get-parameter-schema.js
index 8b2ff60780b..464c3cf00c0 100644
--- a/src/helpers/get-parameter-schema.js
+++ b/src/helpers/get-parameter-schema.js
@@ -86,7 +86,7 @@ export default function getParameterSchema(parameter, { isOAS3 } = {}) {
   }
 
   return {
-    schema: parameter.get("schema", Im.Map()),
+    schema: parameter.get("schema") ? parameter.get("schema", Im.Map()): parameter,
     parameterContentMediaType: null,
   }
 }
diff --git a/test/unit/components/parameter-row.jsx b/test/unit/components/parameter-row.jsx
index 821b457b66a..e478e596286 100644
--- a/test/unit/components/parameter-row.jsx
+++ b/test/unit/components/parameter-row.jsx
@@ -49,6 +49,21 @@ describe("<ParameterRow/>", () => {
     expect(wrapper.find(".parameter__type").text()).toEqual("string")
   })
 
+  it("Can render Swagger 2 parameter type boolean without format", () => {
+    const param = fromJS({
+      name: "hasId",
+      in: "path",
+      description: "boolean value to indicate if the pet has an id",
+      type: "boolean"
+    })
+
+    const props = createProps({ param, isOAS3: false })
+    const wrapper = render(<ParameterRow {...props}/>)
+
+    expect(wrapper.find(".parameter__type").length).toEqual(1)
+    expect(wrapper.find(".parameter__type").text()).toEqual("boolean")
+  })
+
   it("Can render OAS3 parameter type with format", () => {
     const param = fromJS({
       name: "petUuid",
@@ -83,6 +98,21 @@ describe("<ParameterRow/>", () => {
     expect(wrapper.find(".parameter__type").length).toEqual(1)
     expect(wrapper.find(".parameter__type").text()).toEqual("string")
   })
+
+  it("Can render OAS3 parameter type boolean without format", () => {
+    const param = fromJS({
+      name: "hasId",
+      in: "path",
+      description: "boolean value to indicate if the pet has an id",
+      type: "boolean"
+    })
+
+    const props = createProps({ param, isOAS3: true })
+    const wrapper = render(<ParameterRow {...props}/>)
+
+    expect(wrapper.find(".parameter__type").length).toEqual(1)
+    expect(wrapper.find(".parameter__type").text()).toEqual("boolean")
+  })
 })
 
 describe("bug #5573: zero default and example values", function () {

From f405e96abbcee0e47d9d27d59da8161bf9cfbca4 Mon Sep 17 00:00:00 2001
From: ishuen <12228644+ishuen@users.noreply.github.com>
Date: Sat, 22 Oct 2022 22:47:34 +0800
Subject: [PATCH 2/4] Change parameter with empty map

---
 src/helpers/get-parameter-schema.js    | 2 +-
 test/unit/components/parameter-row.jsx | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/helpers/get-parameter-schema.js b/src/helpers/get-parameter-schema.js
index 464c3cf00c0..cdf463c61ff 100644
--- a/src/helpers/get-parameter-schema.js
+++ b/src/helpers/get-parameter-schema.js
@@ -86,7 +86,7 @@ export default function getParameterSchema(parameter, { isOAS3 } = {}) {
   }
 
   return {
-    schema: parameter.get("schema") ? parameter.get("schema", Im.Map()): parameter,
+    schema: parameter.get("schema") ? parameter.get("schema", Im.Map()): Im.Map(),
     parameterContentMediaType: null,
   }
 }
diff --git a/test/unit/components/parameter-row.jsx b/test/unit/components/parameter-row.jsx
index e478e596286..b452682b7d7 100644
--- a/test/unit/components/parameter-row.jsx
+++ b/test/unit/components/parameter-row.jsx
@@ -104,7 +104,9 @@ describe("<ParameterRow/>", () => {
       name: "hasId",
       in: "path",
       description: "boolean value to indicate if the pet has an id",
-      type: "boolean"
+      schema: {
+        type: "boolean"
+      }
     })
 
     const props = createProps({ param, isOAS3: true })

From 39c7a73511b8866756531b1c045e8942039f36f6 Mon Sep 17 00:00:00 2001
From: ishuen <12228644+ishuen@users.noreply.github.com>
Date: Mon, 24 Oct 2022 17:39:24 +0800
Subject: [PATCH 3/4] Change allowValues data type

---
 src/core/json-schema-components.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/json-schema-components.jsx b/src/core/json-schema-components.jsx
index 7d75df1c5f8..82a1f2e58b2 100644
--- a/src/core/json-schema-components.jsx
+++ b/src/core/json-schema-components.jsx
@@ -85,7 +85,7 @@ export class JsonSchema_string extends Component {
       const Select = getComponent("Select")
       return (<Select className={ errors.length ? "invalid" : ""}
                       title={ errors.length ? errors : ""}
-                      allowedValues={ enumValue }
+                      allowedValues={ Array(...enumValue) }
                       value={ value }
                       allowEmptyValue={ !required }
                       disabled={disabled}
@@ -335,14 +335,14 @@ export class JsonSchema_boolean extends Component {
     errors = errors.toJS ? errors.toJS() : []
     let enumValue = schema && schema.get ? schema.get("enum") : null
     let allowEmptyValue = !enumValue || !required
-    let booleanValue = !enumValue && fromJS(["true", "false"])
+    let booleanValue = !enumValue && ["true", "false"]
     const Select = getComponent("Select")
 
     return (<Select className={ errors.length ? "invalid" : ""}
                     title={ errors.length ? errors : ""}
                     value={ String(value) }
                     disabled={ disabled }
-                    allowedValues={ enumValue || booleanValue }
+                    allowedValues={ enumValue ? Array(...enumValue) : booleanValue }
                     allowEmptyValue={ allowEmptyValue }
                     onChange={ this.onEnumChange }/>)
   }

From f1e6c9f29e1948aad425f83e44956cf45f622705 Mon Sep 17 00:00:00 2001
From: ishuen <12228644+ishuen@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:21:08 +0800
Subject: [PATCH 4/4] Change to spread array shorthand

---
 src/core/json-schema-components.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/json-schema-components.jsx b/src/core/json-schema-components.jsx
index 82a1f2e58b2..647340acc17 100644
--- a/src/core/json-schema-components.jsx
+++ b/src/core/json-schema-components.jsx
@@ -85,7 +85,7 @@ export class JsonSchema_string extends Component {
       const Select = getComponent("Select")
       return (<Select className={ errors.length ? "invalid" : ""}
                       title={ errors.length ? errors : ""}
-                      allowedValues={ Array(...enumValue) }
+                      allowedValues={ [...enumValue] }
                       value={ value }
                       allowEmptyValue={ !required }
                       disabled={disabled}
@@ -342,7 +342,7 @@ export class JsonSchema_boolean extends Component {
                     title={ errors.length ? errors : ""}
                     value={ String(value) }
                     disabled={ disabled }
-                    allowedValues={ enumValue ? Array(...enumValue) : booleanValue }
+                    allowedValues={ enumValue ? [...enumValue] : booleanValue }
                     allowEmptyValue={ allowEmptyValue }
                     onChange={ this.onEnumChange }/>)
   }