Merge pull request #27959 from github/repo-sync

Repo sync
github · Sep 1, 2023 · 7989e19 · 7989e19
2 parents 17cc5ae + 667db55
commit 7989e19
Show file tree

Hide file tree

Showing 9 changed files with 524,282 additions and 293,403 deletions.
diff --git a/src/automated-pipelines/components/parameter-table/ParameterRow.tsx b/src/automated-pipelines/components/parameter-table/ParameterRow.tsx
@@ -158,7 +158,7 @@ export function ParameterRow({
           an API request to get the nested parameter data.
        */}
       {rowParams.type &&
-      (rowParams.type === 'object' || rowParams.type.includes('array of')) &&
+      (rowParams.type.includes('object') || rowParams.type.includes('array of')) &&
       rowParams.childParamsGroups &&
       rowParams.childParamsGroups.length === 0 &&
       !NO_CHILD_WEBHOOK_PROPERTIES.includes(rowParams.name) ? (

diff --git a/src/rest/scripts/utils/get-body-params.js b/src/rest/scripts/utils/get-body-params.js
@@ -173,6 +173,12 @@ export async function getBodyParams(schema, topLevel = false) {
         param.description = param.anyOf[0].description
         param.isRequired = param.anyOf[0].required
       }
+    } else if (param && param.allOf) {
+      // this else is only used for webhooks handling of allOf
+      for (const prop of param.allOf) {
+        paramType.push('object')
+        childParamsGroups.push(...(await getBodyParams(prop, false)))
+      }
     }
 
     const paramDecorated = await getTransformedParam(param, paramType, {