Skip to content

RE: fix server variables handling #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 31, 2020
Merged

RE: fix server variables handling #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2a0a4d
Merge pull request #27 from hackolade/master
mtseluiko Jul 29, 2020
8440832
RE: fix empty server variables handling
mtseluiko Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions reverse_engineering/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {

validationHelper.validate(filterSchema(openAPISchema), { resolve: { external: false }})
.then((messages) => {
if (!Array.isArray(messages) || !messages.length) {
if (!Array.isArray(messages) || !messages.length || (messages.length === 1 && messages[0].type === 'success')) {
this.handleErrors(error, logger, callback);
}

Expand All @@ -41,8 +41,8 @@ module.exports = {
},

handleErrors(errorObject, logger, callback) {
const { error, title } = errorObject;
const handledError = commonHelper.handleErrorObject(error, title);
const { error, title, name } = errorObject;
const handledError = commonHelper.handleErrorObject(error || errorObject, title || name);
logger.log('error', handledError, title);
callback(handledError);
},
Expand Down
4 changes: 2 additions & 2 deletions reverse_engineering/helpers/dataHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const getServersData = (servers) => {
if (!server.url) {
return accum;
}

const variables = server.variables ? getServersVariables(server.variables) : [];
return [...accum, {
serverURL: server.url,
Expand All @@ -82,7 +82,7 @@ const getServersVariables = (variables) => {
const variableData = variables[variable];
return {
serverVariableName: variable,
serverVariableEnum: variableData.enum.map(enumVal => ({serverVariableEnumValue: enumVal})),
serverVariableEnum: (variableData.enum || []).map(enumVal => ({serverVariableEnumValue: enumVal})),
serverVariableDefault: variableData.default,
serverVariableDescription: variableData.description,
scopesExtensions: getExtensions(variables)
Expand Down