Merge pull request #2737 from swagger-api/feature/move-scheme-out-of-securtyDefinitions

Move the schemes component out of the securityDefinitions conditional

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(i[r])return i[r].exports;var n=i[r]={exports:{},id:r,loaded:!1};return e[r].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var i={};return t.m=e,t.c=i,t.p="/dist",t(0)}([function(e,t,i){e.exports=i(1)},function(e,t,i){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var n=i(2),s=r(n);i(30);var a=i(34),o=r(a),u=i(37),c=r(u),l=[o.default,c.default,function(){return{components:{StandaloneLayout:s.default}}}];t.default=l},function(e,t,i){"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 s(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 o=function(){function e(e,t){for(var i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,i,r){return i&&e(t.prototype,i),r&&e(t,r),t}}(),u=i(3),c=r(u),l=function(e){function t(){return n(this,t),s(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),o(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,i=e.specActions,r=e.getComponent,n=(e.errSelectors,e.errActions,e.spec,e.readOnly,t.info()),s=t.url(),a=t.basePath(),o=t.host(),u=t.securityDefinitions(),l=t.externalDocs(),h=t.schemes(),p=r("info"),f=r("operations",!0),d=r("models",!0),m=r("authorizeBtn",!0),g=r("Container"),x=r("Row"),y=r("Col"),D=(r("Button"),r("errors",!0)),b=(r("SplitPaneMode",!0),r("schemes")),v=r("Topbar",!0),E=r("onlineValidatorBadge",!0),w=t.loadingStatus();return c.default.createElement(g,{className:"swagger-ui"},v?c.default.createElement(v,null):null,"loading"===w&&c.default.createElement("div",{className:"info"},c.default.createElement("h4",{className:"title"},"Loading...")),"failed"===w&&c.default.createElement("div",{className:"info"},c.default.createElement("h4",{className:"title"},"Failed to load spec.")),"failedConfig"===w&&c.default.createElement("div",{className:"info",style:{maxWidth:"880px",marginLeft:"auto",marginRight:"auto",textAlign:"center"}},c.default.createElement("h4",{className:"title"},"Failed to load config.")),"success"===w&&c.default.createElement("div",null,c.default.createElement(D,null),c.default.createElement(x,{className:"information-container"},c.default.createElement(y,{mobile:12},n.count()?c.default.createElement(p,{info:n,url:s,host:o,basePath:a,externalDocs:l,getComponent:r}):null)),c.default.createElement("div",{className:"scheme-container"},u&&c.default.createElement(y,{className:"schemes wrapper",mobile:12},h&&h.size?c.default.createElement(b,{schemes:h,specActions:i}):null,c.default.createElement(m,null))),c.default.createElement(x,null,c.default.createElement(y,{mobile:12,desktop:12},c.default.createElement(f,null))),c.default.createElement(x,null,c.default.createElement(y,{mobile:12,desktop:12},c.default.createElement(d,null)))),c.default.createElement(x,null,c.default.createElement(y,null,c.default.createElement(E,null))))}}]),t}(c.default.Component);l.propTypes={errSelectors:u.PropTypes.object.isRequired,errActions:u.PropTypes.object.isRequired,specActions:u.PropTypes.object.isRequired,layoutSelectors:u.PropTypes.object.isRequired,layoutActions:u.PropTypes.object.isRequired},t.default=l},function(e,t,i){"use strict";e.exports=i(4)},function(e,t,i){"use strict";var r=i(5),n=i(6),s=i(19),a=i(22),o=i(23),u=i(25),c=i(10),l=i(26),h=i(28),p=i(29),f=(i(12),c.createElement),d=c.createFactory,m=c.cloneElement,g=r,x={Children:{map:n.map,forEach:n.forEach,count:n.count,toArray:n.toArray,only:p},Component:s,PureComponent:a,createElement:f,cloneElement:m,isValidElement:c.isValidElement,PropTypes:l,createClass:o.createClass,createFactory:d,createMixin:function(e){return e},DOM:u,version:h,__spread:g};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(i[r])return i[r].exports;var n=i[r]={exports:{},id:r,loaded:!1};return e[r].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var i={};return t.m=e,t.c=i,t.p="/dist",t(0)}([function(e,t,i){e.exports=i(1)},function(e,t,i){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var n=i(2),s=r(n);i(30);var a=i(34),o=r(a),u=i(37),c=r(u),l=[o.default,c.default,function(){return{components:{StandaloneLayout:s.default}}}];t.default=l},function(e,t,i){"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 s(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 o=function(){function e(e,t){for(var i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,i,r){return i&&e(t.prototype,i),r&&e(t,r),t}}(),u=i(3),c=r(u),l=function(e){function t(){return n(this,t),s(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),o(t,[{key:"render",value:function(){var e=this.props,t=e.specSelectors,i=e.specActions,r=e.getComponent,n=(e.errSelectors,e.errActions,e.spec,e.readOnly,t.info()),s=t.url(),a=t.basePath(),o=t.host(),u=t.securityDefinitions(),l=t.externalDocs(),h=t.schemes(),p=r("info"),f=r("operations",!0),d=r("models",!0),m=r("authorizeBtn",!0),g=r("Container"),x=r("Row"),y=r("Col"),D=(r("Button"),r("errors",!0)),b=(r("SplitPaneMode",!0),r("schemes")),v=r("Topbar",!0),E=r("onlineValidatorBadge",!0),w=t.loadingStatus();return c.default.createElement(g,{className:"swagger-ui"},v?c.default.createElement(v,null):null,"loading"===w&&c.default.createElement("div",{className:"info"},c.default.createElement("h4",{className:"title"},"Loading...")),"failed"===w&&c.default.createElement("div",{className:"info"},c.default.createElement("h4",{className:"title"},"Failed to load spec.")),"failedConfig"===w&&c.default.createElement("div",{className:"info",style:{maxWidth:"880px",marginLeft:"auto",marginRight:"auto",textAlign:"center"}},c.default.createElement("h4",{className:"title"},"Failed to load config.")),"success"===w&&c.default.createElement("div",null,c.default.createElement(D,null),c.default.createElement(x,{className:"information-container"},c.default.createElement(y,{mobile:12},n.count()?c.default.createElement(p,{info:n,url:s,host:o,basePath:a,externalDocs:l,getComponent:r}):null)),c.default.createElement("div",{className:"scheme-container"},c.default.createElement(y,{className:"schemes wrapper",mobile:12},h&&h.size?c.default.createElement(b,{schemes:h,specActions:i}):null,u?c.default.createElement(m,null):null)),c.default.createElement(x,null,c.default.createElement(y,{mobile:12,desktop:12},c.default.createElement(f,null))),c.default.createElement(x,null,c.default.createElement(y,{mobile:12,desktop:12},c.default.createElement(d,null)))),c.default.createElement(x,null,c.default.createElement(y,null,c.default.createElement(E,null))))}}]),t}(c.default.Component);l.propTypes={errSelectors:u.PropTypes.object.isRequired,errActions:u.PropTypes.object.isRequired,specActions:u.PropTypes.object.isRequired,layoutSelectors:u.PropTypes.object.isRequired,layoutActions:u.PropTypes.object.isRequired},t.default=l},function(e,t,i){"use strict";e.exports=i(4)},function(e,t,i){"use strict";var r=i(5),n=i(6),s=i(19),a=i(22),o=i(23),u=i(25),c=i(10),l=i(26),h=i(28),p=i(29),f=(i(12),c.createElement),d=c.createFactory,m=c.cloneElement,g=r,x={Children:{map:n.map,forEach:n.forEach,count:n.count,toArray:n.toArray,only:p},Component:s,PureComponent:a,createElement:f,cloneElement:m,isValidElement:c.isValidElement,PropTypes:l,createClass:o.createClass,createFactory:d,createMixin:function(e){return e},DOM:u,version:h,__spread:g};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;;;;;AAwSA;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;AAqwFA;;;;;;AA4eA;AAkvFA;AAu+CA;AAo+CA;AAgrCA;AAgyEA","sourceRoot":""}

src/standalone/layout.jsx

@@ -67,12 +67,14 @@ export default class StandaloneLayout extends React.Component {
                 </Col>
               </Row>
               <div className="scheme-container">
-                { securityDefinitions &&
-                    <Col className="schemes wrapper" mobile={12}>
-                      { schemes && schemes.size ? <Schemes schemes={ schemes } specActions={ specActions } /> : null }
-                      <AuthorizeBtn />
-                    </Col>
-                }
+                <Col className="schemes wrapper" mobile={12}>
+                  { schemes && schemes.size ? (
+                    <Schemes schemes={ schemes } specActions={ specActions } /> 
+                  ) : null }
+                  { securityDefinitions ? (
+                    <AuthorizeBtn />
+                  ) : null }
+                </Col>
               </div>
               <Row>
                 <Col mobile={12} desktop={12} >