Skip to content

Commit

Permalink
UI: Parse OpenAPI response correctly if schema includes $ref (#14508)
Browse files Browse the repository at this point in the history
* Parse OpenAPI response correctly if schema includes

* Add changelog

* small cleanup
  • Loading branch information
hashishaw authored Mar 16, 2022
1 parent 618296f commit 49d44a9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
3 changes: 3 additions & 0 deletions changelog/14508.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
ui: Parse schema refs from OpenAPI
```
16 changes: 12 additions & 4 deletions ui/app/services/path-help.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,18 @@ export default Service.extend({
};
}

// TODO: handle post endpoints without requestBody
const props = pathInfo.post
? pathInfo.post.requestBody.content['application/json'].schema.properties
: {};
let props = {};
const schema = pathInfo?.post?.requestBody?.content['application/json'].schema;
if (schema.$ref) {
// $ref will be shaped like `#/components/schemas/MyResponseType
// which maps to the location of the item within the openApi response
let loc = schema.$ref.replace('#/', '').split('/');
props = loc.reduce((prev, curr) => {
return prev[curr] || {};
}, help.openapi).properties;
} else if (schema.properties) {
props = schema.properties;
}
// put url params (e.g. {name}, {role})
// at the front of the props list
const newProps = assign({}, paramProp, props);
Expand Down

0 comments on commit 49d44a9

Please sign in to comment.