One of objects openapi (#37826)

Author: rachmari

src/rest/scripts/utils/get-body-params.js

@@ -106,18 +106,7 @@ export async function getBodyParams(schema, topLevel = false) {
         if (param.items.oneOf.every((object) => object.type === 'object')) {
           paramType.splice(paramType.indexOf('array'), 1, `array of objects`)
           param.oneOfObject = true
-
-          for (const oneOfParam of param.items.oneOf) {
-            const objParam = {
-              type: 'object',
-              name: oneOfParam.title,
-              description: await renderContent(oneOfParam.description),
-              isRequired: oneOfParam.required,
-              childParamsGroups: [],
-            }
-            objParam.childParamsGroups.push(...(await getBodyParams(oneOfParam, false)))
-            childParamsGroups.push(objParam)
-          }
+          childParamsGroups.push(...(await getOneOfChildParams(param.items)))
         }
       } else {
         const arrayType = param.items.type
@@ -129,7 +118,14 @@ export async function getBodyParams(schema, topLevel = false) {
         }
       }
     } else if (paramType && paramType.includes('object')) {
-      childParamsGroups.push(...(await getBodyParams(param, false)))
+      if (param && param.oneOf) {
+        if (param.oneOf.every((object) => object.type === 'object')) {
+          param.oneOfObject = true
+          childParamsGroups.push(...(await getOneOfChildParams(param)))
+        }
+      } else {
+        childParamsGroups.push(...(await getBodyParams(param, false)))
+      }
     } else if (param && param.oneOf) {
       // get concatenated description and type
       const descriptions = []
@@ -150,6 +146,8 @@ export async function getBodyParams(schema, topLevel = false) {
               descriptions.push({ type: childParam.type, description: childParam.description })
             }
           }
+        } else {
+          descriptions.push({ type: param.type, description: param.description })
         }
       }
       // Occasionally, there is no parent description and the description
@@ -205,7 +203,7 @@ async function getTransformedParam(param, paramType, props) {
   if (required && required.includes(paramKey)) {
     paramDecorated.isRequired = true
   }
-  if (childParamsGroups && childParamsGroups.length > 0) {
+  if (childParamsGroups && childParamsGroups.length > 0 && !param.oneOfObject) {
     // Since the allOf properties can have multiple duplicate properties we want to get rid of the duplicates with the same name, but keep the
     // the one that has isRequired set to true.
     const mergedChildParamsGroups = Array.from(
@@ -221,6 +219,8 @@ async function getTransformedParam(param, paramType, props) {
     )
 
     paramDecorated.childParamsGroups = mergedChildParamsGroups
+  } else if (childParamsGroups.length > 0) {
+    paramDecorated.childParamsGroups = childParamsGroups
   }
   if (param.enum) {
     paramDecorated.enum = param.enum
@@ -236,3 +236,19 @@ async function getTransformedParam(param, paramType, props) {
   }
   return paramDecorated
 }
+
+async function getOneOfChildParams(param) {
+  const childParamsGroups = []
+  for (const oneOfParam of param.oneOf) {
+    const objParam = {
+      type: 'object',
+      name: oneOfParam.title,
+      description: await renderContent(oneOfParam.description),
+      isRequired: oneOfParam.required,
+      childParamsGroups: [],
+    }
+    objParam.childParamsGroups.push(...(await getBodyParams(oneOfParam, false)))
+    childParamsGroups.push(objParam)
+  }
+  return childParamsGroups
+}