Move loadingStatus code into StandaloneLayout (where it belongs!)

dist/swagger-ui-standalone-preset.js

@@ -1,4 +1,4 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SwaggerUIStandalonePreset=t():e.SwaggerUIStandalonePreset=t()}(this,function(){return function(e){function t(r){if(o[r])return o[r].exports;var n=o[r]={exports:{},id:r,loaded:!1};return e[r].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var o={};return t.m=e,t.c=o,t.p="/dist",t(0)}([function(e,t,o){e.exports=o(1)},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}var n=o(2),i=r(n);o(30);var a=o(34),s=r(a),l=[s.default,function(){return{components:{StandaloneLayout:i.default}}}];e.exports=l},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=function(){function e(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,o,r){return o&&e(t.prototype,o),r&&e(t,r),t}}(),l=o(3),p=r(l),u=function(e){function t(){return n(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,o=(e.specActions,e.getComponent),r=(t.info(),t.url(),t.basePath(),t.host(),t.securityDefinitions(),t.externalDocs(),t.schemes(),o("info"),o("operations",!0),o("models",!0),o("authorizeBtn",!0),o("Container")),n=o("Row"),i=o("Col"),a=(o("errors",!0),o("schemes"),o("Topbar",!0)),s=o("BaseLayout",!0),l=o("onlineValidatorBadge",!0);t.loadingStatus();return p.default.createElement(r,{className:"swagger-ui"},a?p.default.createElement(a,null):null,p.default.createElement(s,null),p.default.createElement(n,null,p.default.createElement(i,null,p.default.createElement(l,null))))}}]),t}(p.default.Component);u.propTypes={errSelectors:l.PropTypes.object.isRequired,errActions:l.PropTypes.object.isRequired,specActions:l.PropTypes.object.isRequired,specSelectors:l.PropTypes.object.isRequired,layoutSelectors:l.PropTypes.object.isRequired,layoutActions:l.PropTypes.object.isRequired,getComponent:l.PropTypes.func.isRequired},t.default=u},function(e,t,o){"use strict";e.exports=o(4)},function(e,t,o){"use strict";var r=o(5),n=o(6),i=o(19),a=o(22),s=o(23),l=o(25),p=o(10),u=o(26),c=o(28),f=o(29),d=(o(12),p.createElement),g=p.createFactory,b=p.cloneElement,m=r,x={Children:{map:n.map,forEach:n.forEach,count:n.count,toArray:n.toArray,only:f},Component:i,PureComponent:a,createElement:d,cloneElement:b,isValidElement:p.isValidElement,PropTypes:u,createClass:s.createClass,createFactory:g,createMixin:function(e){return e},DOM:l,version:c,__spread:m};e.exports=x},function(e,t){/*
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SwaggerUIStandalonePreset=t():e.SwaggerUIStandalonePreset=t()}(this,function(){return function(e){function t(r){if(o[r])return o[r].exports;var n=o[r]={exports:{},id:r,loaded:!1};return e[r].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var o={};return t.m=e,t.c=o,t.p="/dist",t(0)}([function(e,t,o){e.exports=o(1)},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}var n=o(2),i=r(n);o(30);var a=o(34),s=r(a),l=[s.default,function(){return{components:{StandaloneLayout:i.default}}}];e.exports=l},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=function(){function e(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,o,r){return o&&e(t.prototype,o),r&&e(t,r),t}}(),l=o(3),p=r(l),u=function(e){function t(){return n(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function(){var e=this.props.getComponent,t=e("Container"),o=e("Row"),r=e("Col"),n=e("Topbar",!0),i=e("BaseLayout",!0),a=e("onlineValidatorBadge",!0);return p.default.createElement(t,{className:"swagger-ui"},n?p.default.createElement(n,null):null,p.default.createElement(i,null),p.default.createElement(o,null,p.default.createElement(r,null,p.default.createElement(a,null))))}}]),t}(p.default.Component);u.propTypes={errSelectors:l.PropTypes.object.isRequired,errActions:l.PropTypes.object.isRequired,specActions:l.PropTypes.object.isRequired,specSelectors:l.PropTypes.object.isRequired,layoutSelectors:l.PropTypes.object.isRequired,layoutActions:l.PropTypes.object.isRequired,getComponent:l.PropTypes.func.isRequired},t.default=u},function(e,t,o){"use strict";e.exports=o(4)},function(e,t,o){"use strict";var r=o(5),n=o(6),i=o(19),a=o(22),s=o(23),l=o(25),p=o(10),u=o(26),c=o(28),f=o(29),d=(o(12),p.createElement),g=p.createFactory,b=p.cloneElement,m=r,x={Children:{map:n.map,forEach:n.forEach,count:n.count,toArray:n.toArray,only:f},Component:i,PureComponent:a,createElement:d,cloneElement:b,isValidElement:p.isValidElement,PropTypes:u,createClass:s.createClass,createFactory:g,createMixin:function(e){return e},DOM:l,version:c,__spread:m};e.exports=x},function(e,t){/*
 	object-assign
 	(c) Sindre Sorhus
 	@license MIT

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;;;;;AA2PA;AAyiGA","sourceRoot":""}
+{"version":3,"file":"swagger-ui-standalone-preset.js","sources":["webpack:///swagger-ui-standalone-preset.js"],"mappings":"AAAA;;;;;AA4OA;AAyiGA","sourceRoot":""}

dist/swagger-ui.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AAuwCA;AAoyHA;AAsxHA;AAo8FA;AAooCA;AAghCA;AA0gCA;AA65BA","sourceRoot":""}
+{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AAuwCA;AAoyHA;AAsxHA;AAo8FA;AAooCA;AAghCA;AA0gCA;AA06BA","sourceRoot":""}

src/core/components/layouts/base.jsx

@@ -32,27 +32,15 @@ export default class BaseLayout extends React.Component {
     let Errors = getComponent("errors", true)
     const Schemes = getComponent("schemes")
 
-    const loadingStatus = specSelectors.loadingStatus()
+    const isSpecEmpty = !specSelectors.specStr()
+
+    if(isSpecEmpty) {
+      return <h4>No spec provided.</h4>
+    }
 
     return (
 
       <div className='swagger-ui'>
-        { loadingStatus === "loading" &&
-          <div className="info">
-            <h4 className="title">Loading...</h4>
-          </div>
-        }
-        { loadingStatus === "failed" &&
-          <div className="info">
-            <h4 className="title">Failed to load spec.</h4>
-          </div>
-        }
-        { loadingStatus === "failedConfig" &&
-          <div className="info" style={{ maxWidth: "880px", marginLeft: "auto", marginRight: "auto", textAlign: "center" }}>
-            <h4 className="title">Failed to load config.</h4>
-          </div>
-        }
-        { loadingStatus === "success" &&
           <div>
             <Errors/>
             <Row className="information-container">
@@ -85,8 +73,8 @@ export default class BaseLayout extends React.Component {
                 <Models/>
               </Col>
             </Row>
-          </div> }
+          </div>
         </div>
       )
   }
-  }
+}

src/standalone/layout.jsx

@@ -13,7 +13,7 @@ export default class StandaloneLayout extends React.Component {
   }
 
   render() {
-    let { getComponent } = this.props
+    let { getComponent, specSelectors } = this.props
 
     let Container = getComponent("Container")
     let Row = getComponent("Row")
@@ -23,11 +23,28 @@ export default class StandaloneLayout extends React.Component {
     const BaseLayout = getComponent("BaseLayout", true)
     const OnlineValidatorBadge = getComponent("onlineValidatorBadge", true)
 
+    const loadingStatus = specSelectors.loadingStatus()
+
     return (
 
       <Container className='swagger-ui'>
         { Topbar ? <Topbar/> : null }
-        <BaseLayout></BaseLayout>
+        { loadingStatus === "loading" &&
+          <div className="info">
+            <h4 className="title">Loading...</h4>
+          </div>
+        }
+        { loadingStatus === "failed" &&
+          <div className="info">
+            <h4 className="title">Failed to load spec.</h4>
+          </div>
+        }
+        { loadingStatus === "failedConfig" &&
+          <div className="info" style={{ maxWidth: "880px", marginLeft: "auto", marginRight: "auto", textAlign: "center" }}>
+            <h4 className="title">Failed to load config.</h4>
+          </div>
+        }
+        { !loadingStatus || loadingStatus === "success" && <BaseLayout/> }
         <Row>
           <Col>
             <OnlineValidatorBadge />