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

improve: nest Servers within Schemes container (via #4911)

Browse Source 
* improve: nest Servers within Schemes container

* linter fixes
This commit is contained in:
kyle
2018-09-28 20:33:06 -05:00
committed by GitHub
parent 1690b319af
commit c5c4e08368
5 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/components/layouts/base.jsx
View File

@@ -60,9 +60,10 @@ export default class BaseLayout extends React.Component {
</Col>
</Row>
<SchemesContainer/>
<SchemesContainer>
<ServersContainer/>
</SchemesContainer>
<ServersContainer/>
<FilterContainer/>

2
src/core/containers/schemes.jsx
View File

@@ -7,6 +7,7 @@ export default class SchemesContainer extends React.Component {
specActions: PropTypes.object.isRequired,
specSelectors: PropTypes.object.isRequired,
getComponent: PropTypes.func.isRequired,
children: PropTypes.any
}
render () {
@@ -24,6 +25,7 @@ export default class SchemesContainer extends React.Component {
{schemes && schemes.size || securityDefinitions ? (
<div className="scheme-container">
<Col className="schemes wrapper" mobile={12}>
{this.props.children}
{schemes && schemes.size ? (
<Schemes
currentScheme={currentScheme}

33
src/core/plugins/oas3/components/servers-container.jsx
View File

@@ -15,28 +15,19 @@ export default class ServersContainer extends React.Component {
const servers = specSelectors.servers()
const Col = getComponent("Col")
const Servers = getComponent("Servers")
return (
return servers && servers.size ? (
<div>
{servers && servers.size ? (
<div className="global-server-container">
<Col className="servers wrapper" mobile={12}>
<span className="servers-title">Server</span>
<Servers
servers={servers}
currentServer={oas3Selectors.selectedServer()}
setSelectedServer={oas3Actions.setSelectedServer}
setServerVariableValue={oas3Actions.setServerVariableValue}
getServerVariable={oas3Selectors.serverVariableValue}
getEffectiveServerValue={oas3Selectors.serverEffectiveValue}
/>
</Col>
</div>
) : null}
</div>
)
<span className="servers-title">Servers</span>
<Servers
servers={servers}
currentServer={oas3Selectors.selectedServer()}
setSelectedServer={oas3Actions.setSelectedServer}
setServerVariableValue={oas3Actions.setServerVariableValue}
getServerVariable={oas3Selectors.serverVariableValue}
getEffectiveServerValue={oas3Selectors.serverEffectiveValue}
/>
</div> ) : null
}
}
}