Merge branch 'bodnia-url-from-query'

dist/swagger-ui-bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;AA6OA;;;;;;AAoIA;AAm7FA;AAwtCA;AAg0IA;;;;;AAkxBA;AAo8IA;AA41GA;AA23FA;AAqqFA;AA0nFA;AA49CA;AAwhDA;AAkrCA;AAumFA;AAmnHA;;;;;;;;;;;;;;AAqjHA;AAyoIA;AAkuJA;AAilHA;AA4kGA;AAwkEA;AAs3DA;AAovDA;AAotBA;AAoqGA;;;;;;AAueA;AAimGA;AA44EA;;;;;AAoGA;AA2qFA;AAo2CA;AAkvDA;AA8tCA;AAoiEA;AA69FA;;;;;;;;;AA20BA;AA2zIA;AAm4DA","sourceRoot":""}
+{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;AAoOA;;;;;;AAoIA;AAm7FA;AAwtCA;AAg0IA;;;;;AAkxBA;AA+7IA;AAi2GA;AA43FA;AA6oFA;AAipFA;AA+9CA;AA0gDA;AA0rCA;AA80EA;AAs4HA;;;;;;;;;;;;;;AA8kHA;AAyoIA;AAkuJA;AAilHA;AA4kGA;AAwkEA;AAs3DA;AAovDA;AA0tBA;AA+pGA;;;;;;AAseA;AAimGA;AA44EA;;;;;AAoGA;AA2qFA;AAm2CA;AA2vDA;AAgtCA;AA4iEA;AA89FA;;;;;;;;;AAk0BA;AA2zIA;AAm4DA","sourceRoot":""}

dist/swagger-ui-standalone-preset.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui-standalone-preset.js","sources":["webpack:///swagger-ui-standalone-preset.js"],"mappings":"AAAA;;;;;AA0SA;AAyiGA;AAqwFA;;;;;;AA4eA;AAkvFA;AAu+CA;AAo+CA;AAgrCA;AAgyEA","sourceRoot":""}
+{"version":3,"file":"swagger-ui-standalone-preset.js","sources":["webpack:///swagger-ui-standalone-preset.js"],"mappings":"AAAA;;;;;AA0SA;AAyiGA;AA2wFA;;;;;;AAudA;AAkvFA;AAu+CA;AAo+CA;AAgrCA;AAgyEA;AAsvIA;AAygCA;AA6jLA;AAiwFA;AAywGA","sourceRoot":""}

dist/swagger-ui.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;AAooGA;AA20HA;AAgjGA;AA6lCA;AAw+BA;AAkvCA;AAs5BA","sourceRoot":""}
+{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;AAqnGA;AAi2HA;AA6+FA;AAgqCA;AAw+BA;AAkvCA;AAs5BA","sourceRoot":""}

src/core/index.js

@@ -4,6 +4,7 @@ import System from "core/system"
 import ApisPreset from "core/presets/apis"
 import * as AllPlugins from "core/plugins/all"
 import { filterConfigs } from "plugins/configs"
+import { parseSeach } from "core/utils"
 
 module.exports = function SwaggerUI(opts) {
 
@@ -35,74 +36,58 @@ module.exports = function SwaggerUI(opts) {
     store: { },
   }
 
-  const config = deepExtend({}, defaults, opts)
+  const constructorConfig = deepExtend({}, defaults, opts)
 
-  const storeConfigs = deepExtend({}, config.store, {
+  const storeConfigs = deepExtend({}, constructorConfig.store, {
     system: {
-      configs: config.configs
+      configs: constructorConfig.configs
     },
-    plugins: config.presets,
+    plugins: constructorConfig.presets,
     state: {
       layout: {
-        layout: config.layout
+        layout: constructorConfig.layout
       },
       spec: {
         spec: "",
-        url: config.url
+        url: constructorConfig.url
       }
     }
   })
 
   let inlinePlugin = ()=> {
     return {
-      fn: config.fn,
-      components: config.components,
-      state: config.state,
+      fn: constructorConfig.fn,
+      components: constructorConfig.components,
+      state: constructorConfig.state,
     }
   }
 
   var store = new System(storeConfigs)
-  store.register([config.plugins, inlinePlugin])
+  store.register([constructorConfig.plugins, inlinePlugin])
 
   var system = store.getSystem()
+  let queryConfig = parseSeach()
 
   const downloadSpec = (configs) => {
-    if(typeof config !== "object") {
+    if(typeof constructorConfig !== "object") {
       return system
     }
 
     let localConfig = system.specSelectors.getLocalConfig ? system.specSelectors.getLocalConfig() : {}
-    let mergedConfig = deepExtend({}, config, configs, localConfig)
+    let mergedConfig = deepExtend({}, constructorConfig, localConfig, queryConfig)
     store.setConfigs(filterConfigs(mergedConfig))
 
-    if(typeof mergedConfig.spec === "object" && Object.keys(mergedConfig.spec).length) {
+    if(!queryConfig.url && typeof mergedConfig.spec === "object" && Object.keys(mergedConfig.spec).length) {
       system.specActions.updateUrl("")
       system.specActions.updateLoadingStatus("success");
       system.specActions.updateSpec(JSON.stringify(mergedConfig.spec))
-    } else if(mergedConfig.url) {
+    } else if(system.specActions.download && mergedConfig.url) {
       system.specActions.updateUrl(mergedConfig.url)
       system.specActions.download(mergedConfig.url)
     }
 
-    if(mergedConfig.dom_id)
+    if(mergedConfig.dom_id) {
       system.render(mergedConfig.dom_id, "App")
-
-    return system
-  }
-
-  if (system.specActions.getConfigByUrl && !system.specActions.getConfigByUrl(downloadSpec)) {
-    return downloadSpec(config)
-  }
-
-  if (system.specActions.download && config.url) {
-    system.specActions.download(config.url)
-  }
-
-  if(config.spec && typeof config.spec === "string")
-    system.specActions.updateSpec(config.spec)
-
-  if(config.dom_id) {
-    system.render(config.dom_id, "App")
     } else {
       console.error("Skipped rendering: no `dom_id` was specified")
     }
@@ -110,6 +95,12 @@ module.exports = function SwaggerUI(opts) {
     return system
   }
 
+  if (!system.specActions.getConfigByUrl || (system.specActions.getConfigByUrl && !system.specActions.getConfigByUrl(downloadSpec))) {
+    return downloadSpec(constructorConfig)
+  }
+
+}
+
 // Add presets
 module.exports.presets = {
   apis: ApisPreset,

src/core/plugins/download-url.js

@@ -30,7 +30,7 @@ export default function downloadUrlPlugin (toolbox) {
     },
 
     updateLoadingStatus: (status) => {
-      let enums = [null, "loading", "failed", "success"]
+      let enums = [null, "loading", "failed", "success", "failedConfig"]
       if(enums.indexOf(status) === -1) {
         console.error(`Error: ${status} is not one of ${JSON.stringify(enums)}`)
       }

src/core/utils.js

@@ -549,3 +549,19 @@ export const getSampleSchema = (schema, contentType="", config={}) => {
 
   return JSON.stringify(memoizedSampleFromSchema(schema, config), null, 2)
 }
+
+export const parseSeach = () => {
+  let map = {}
+  let search = window.location.search
+
+  if ( search != "" ) {
+    let params = search.substr(1).split("&");
+
+    for (let i in params) {
+      i = params[i].split("=");
+      map[decodeURIComponent(i[0])] = decodeURIComponent(i[1]);
+    }
+  }
+
+  return map;
+}

src/plugins/configs/index.js

@@ -1,4 +1,5 @@
 import YAML from "js-yaml"
+import { parseSeach } from "core/utils"
 import yamlConfig from "../../../swagger-config.yaml"
 
 const CONFIGS = [ "url", "spec", "validatorUrl", "onComplete", "onFailure", "authorizations", "docExpansion",
@@ -16,22 +17,6 @@ const parseYamlConfig = (yaml, system) => {
     }
 }
 
-const parseSeach = () => {
-    let map = {}
-    let search = window.location.search
-
-    if ( search != "" ) {
-        let params = search.substr(1).split("&");
-
-        for (let i in params) {
-            i = params[i].split("=");
-            map[decodeURIComponent(i[0])] = decodeURIComponent(i[1]);
-        }
-    }
-
-    return map;
-}
-
 
 export default function configPlugin (toolbox) {
     let { fn } = toolbox