Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2024-11-13 12:26:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix treating refereced schemas with simple types (string, integer) as nested

Browse Source
This commit is contained in:
Roman Hotsiy 2016-03-09 00:28:55 +02:00
parent 3f698caabe
commit 0a8440f44b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/components/JsonSchema/json-schema.js
View File

@ -108,15 +108,18 @@ export default class JsonSchema extends BaseComponent {
propData.format = itemFormat; propData.format = itemFormat;
propData._isArray = true; propData._isArray = true;
propData.type = 'array ' + propData.items.type; propData.type = 'array ' + propData.items.type;
} } else if (propData.type === 'object') {
if (propData.type === 'object') {
propData._displayType = propData.title || 'object'; propData._displayType = propData.title || 'object';
} } else if (!propData.type) {
if (!propData.type) {
propData._displayType = '< * >'; propData._displayType = '< * >';
propData._displayTypeHint = 'This field may contain data of any type'; propData._displayTypeHint = 'This field may contain data of any type';
} else {
// here we are sure that property has simple type
// delete pointer for simple types to not show it as subschema
if (propData._pointer) {
propData._pointer = undefined;
propData._displayType = propData.title ? `${propData.title} (${propData.type})` : propData.type;
}
} }
if (propData.format) propData._displayFormat = `<${propData.format}>`; if (propData.format) propData._displayFormat = `<${propData.format}>`;

3
lib/components/ParamsList/params-list.js
View File

@ -26,6 +26,7 @@ export default class ParamsList extends BaseComponent {
paramsList = paramsList.map((paramData) => { paramsList = paramsList.map((paramData) => {
let propPointer = paramData._pointer; let propPointer = paramData._pointer;
if (paramData.in === 'body') return paramData;
return JsonSchema.injectPropData(paramData, paramData.name, propPointer); return JsonSchema.injectPropData(paramData, paramData.name, propPointer);
}); });
@ -35,7 +36,7 @@ export default class ParamsList extends BaseComponent {
let bodyParam = paramsMap.body[0]; let bodyParam = paramsMap.body[0];
bodyParam.pointer = bodyParam._pointer; bodyParam.pointer = bodyParam._pointer;
this.data.bodyParam = bodyParam; this.data.bodyParam = bodyParam;
delete paramsMap.body; paramsMap.body = undefined;
} }
this.data.noParams = !(Object.keys(paramsMap).length || this.data.bodyParam); this.data.noParams = !(Object.keys(paramsMap).length || this.data.bodyParam);