kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2877 from bodnia/config-with-url

Browse Source 
config passed with configUrl in constructor
This commit is contained in:
Anna
2017-04-07 16:04:05 +03:00
committed by GitHub
parent 4fd5d9f643 eb4fa2a6b4
commit 3c0fe96dde
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/index.js
View File

@@ -68,22 +68,24 @@ module.exports = function SwaggerUI(opts) {
var system = store.getSystem() var system = store.getSystem()
let queryConfig = parseSeach() let queryConfig = parseSeach()
const downloadSpec = () => { const downloadSpec = (fetchedConfig) => {
if(typeof constructorConfig !== "object") { if(typeof constructorConfig !== "object") {
return system return system
} }
let localConfig = system.specSelectors.getLocalConfig ? system.specSelectors.getLocalConfig() : {} let localConfig = system.specSelectors.getLocalConfig ? system.specSelectors.getLocalConfig() : {}
let mergedConfig = deepExtend({}, constructorConfig, localConfig, queryConfig) let mergedConfig = deepExtend({}, constructorConfig, localConfig, fetchedConfig || {}, queryConfig)
store.setConfigs(filterConfigs(mergedConfig)) store.setConfigs(filterConfigs(mergedConfig))
if(!queryConfig.url && typeof mergedConfig.spec === "object" && Object.keys(mergedConfig.spec).length) { if (fetchedConfig !== null) {
system.specActions.updateUrl("") if (!queryConfig.url && typeof mergedConfig.spec === "object" && Object.keys(mergedConfig.spec).length) {
system.specActions.updateLoadingStatus("success") system.specActions.updateUrl("")
system.specActions.updateSpec(JSON.stringify(mergedConfig.spec)) system.specActions.updateLoadingStatus("success")
} else if(system.specActions.download && mergedConfig.url) { system.specActions.updateSpec(JSON.stringify(mergedConfig.spec))
system.specActions.updateUrl(mergedConfig.url) } else if (system.specActions.download && mergedConfig.url) {
system.specActions.download(mergedConfig.url) system.specActions.updateUrl(mergedConfig.url)
system.specActions.download(mergedConfig.url)
}
} }
if(mergedConfig.dom_id) { if(mergedConfig.dom_id) {
@@ -95,7 +97,9 @@ module.exports = function SwaggerUI(opts) {
return system return system
} }
if (!system.specActions.getConfigByUrl || (system.specActions.getConfigByUrl && !system.specActions.getConfigByUrl(downloadSpec))) { let configUrl = queryConfig.config || constructorConfig.configUrl
if (!configUrl || !system.specActions.getConfigByUrl || system.specActions.getConfigByUrl && !system.specActions.getConfigByUrl(configUrl, downloadSpec)) {
return downloadSpec() return downloadSpec()
} }

10
src/plugins/configs/index.js
View File

@@ -1,5 +1,4 @@
import YAML from "js-yaml" import YAML from "js-yaml"
import { parseSeach } from "core/utils"
import yamlConfig from "../../../swagger-config.yaml" import yamlConfig from "../../../swagger-config.yaml"
const CONFIGS = [ "url", "spec", "validatorUrl", "onComplete", "onFailure", "authorizations", "docExpansion", const CONFIGS = [ "url", "spec", "validatorUrl", "onComplete", "onFailure", "authorizations", "docExpansion",
@@ -27,9 +26,7 @@ export default function configPlugin (toolbox) {
return fetch(url) return fetch(url)
}, },
getConfigByUrl: (callback)=> ({ specActions }) => { getConfigByUrl: (configUrl, cb)=> ({ specActions }) => {
let config = parseSeach()
let configUrl = config.config
if (configUrl) { if (configUrl) {
return specActions.downloadConfig(configUrl).then(next, next) return specActions.downloadConfig(configUrl).then(next, next)
} }
@@ -37,9 +34,12 @@ export default function configPlugin (toolbox) {
function next(res) { function next(res) {
if (res instanceof Error || res.status >= 400) { if (res instanceof Error || res.status >= 400) {
specActions.updateLoadingStatus("failedConfig") specActions.updateLoadingStatus("failedConfig")
specActions.updateLoadingStatus("failedConfig")
specActions.updateUrl("")
console.error(res.statusText + " " + configUrl) console.error(res.statusText + " " + configUrl)
cb(null)
} else { } else {
callback(parseYamlConfig(res.text)) cb(parseYamlConfig(res.text))
} }
} }
} }