From 71c33d0af8be5123d4ae746a6d719f9ec139e3f6 Mon Sep 17 00:00:00 2001 From: kyle Date: Thu, 26 Oct 2017 10:57:36 -0700 Subject: [PATCH 1/4] Update topbar.jsx --- src/plugins/topbar/topbar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/topbar/topbar.jsx b/src/plugins/topbar/topbar.jsx index ec9db730..211ab5b8 100644 --- a/src/plugins/topbar/topbar.jsx +++ b/src/plugins/topbar/topbar.jsx @@ -129,7 +129,7 @@ export default class Topbar extends React.Component {
- + Swagger UI swagger From 8f0b49837466e275c68ee0e83c77943650ce9d2b Mon Sep 17 00:00:00 2001 From: kyle Date: Thu, 26 Oct 2017 10:59:06 -0700 Subject: [PATCH 2/4] Update add-plugin.md --- src/plugins/add-plugin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/add-plugin.md b/src/plugins/add-plugin.md index 2e2d52e1..9e228b0a 100644 --- a/src/plugins/add-plugin.md +++ b/src/plugins/add-plugin.md @@ -1,6 +1,6 @@ # Add a plugin -### Swagger-UX relies on plugins for all the good stuff. +### Swagger-UI relies on plugins for all the good stuff. Plugins allow you to add - `statePlugins` From 26428cd63becbabc6b4526c60b8932011e9cc8bf Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Thu, 26 Oct 2017 14:51:00 -0700 Subject: [PATCH 3/4] Provide interceptors to SwaggerClient.resolve --- src/core/plugins/spec/actions.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js index 54895679..75c2a6b4 100644 --- a/src/core/plugins/spec/actions.js +++ b/src/core/plugins/spec/actions.js @@ -80,7 +80,12 @@ export const parseToJson = (str) => ({specActions, specSelectors, errActions}) = } export const resolveSpec = (json, url) => ({specActions, specSelectors, errActions, fn: { fetch, resolve, AST }, getConfigs}) => { - const { modelPropertyMacro, parameterMacro } = getConfigs() + const { + modelPropertyMacro, + parameterMacro, + requestInterceptor, + responseInterceptor + } = getConfigs() if(typeof(json) === "undefined") { json = specSelectors.specJson() @@ -93,8 +98,15 @@ export const resolveSpec = (json, url) => ({specActions, specSelectors, errActio let specStr = specSelectors.specStr() - return resolve({fetch, spec: json, baseDoc: url, modelPropertyMacro, parameterMacro }) - .then( ({spec, errors}) => { + return resolve({ + fetch, + spec: json, + baseDoc: url, + modelPropertyMacro, + parameterMacro, + requestInterceptor, + responseInterceptor + }).then( ({spec, errors}) => { errActions.clear({ type: "thrown" }) @@ -140,7 +152,7 @@ export function changeParam( path, paramName, paramIn, value, isXml ){ export const validateParams = ( payload, isOAS3 ) =>{ return { type: VALIDATE_PARAMS, - payload:{ + payload:{ pathMethod: payload, isOAS3 } From 715964950114e17ed7999268a3dc678bdbbba7c2 Mon Sep 17 00:00:00 2001 From: Kyle Shockey Date: Thu, 26 Oct 2017 15:32:14 -0700 Subject: [PATCH 4/4] Return null instead of empty ImmutableMap in OAS3 securityDefinitions selector --- src/core/plugins/oas3/spec-extensions/wrap-selectors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/plugins/oas3/spec-extensions/wrap-selectors.js b/src/core/plugins/oas3/spec-extensions/wrap-selectors.js index 78ab05a8..21021251 100644 --- a/src/core/plugins/oas3/spec-extensions/wrap-selectors.js +++ b/src/core/plugins/oas3/spec-extensions/wrap-selectors.js @@ -50,7 +50,7 @@ export const definitions = onlyOAS3(createSelector( export const securityDefinitions = onlyOAS3(createSelector( spec, - spec => spec.getIn(["components", "securitySchemes"]) || Map() + spec => spec.getIn(["components", "securitySchemes"]) || null )) export const host = OAS3NullSelector