Skip to content

improve: nest Servers within Schemes container #4911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2018
Merged

improve: nest Servers within Schemes container #4911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b053130
improve: nest Servers within Schemes container
shockey Sep 29, 2018
ad6eb74
linter fixes
shockey Sep 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/core/components/layouts/base.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ export default class BaseLayout extends React.Component {
</Col>
</Row>

<SchemesContainer/>
<SchemesContainer>
<ServersContainer/>
</SchemesContainer>

<ServersContainer/>

<FilterContainer/>

Expand Down
2 changes: 2 additions & 0 deletions src/core/containers/schemes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand All @@ -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}
Expand Down
33 changes: 12 additions & 21 deletions src/core/plugins/oas3/components/servers-container.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
2 changes: 1 addition & 1 deletion src/style/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@
.schemes
{
display: flex;
align-items: center;
align-items: flex-end;

> label
{
Expand Down
16 changes: 3 additions & 13 deletions src/style/_servers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,9 @@
}
}


.global-server-container
{
margin: 0 0 20px 0;
padding: 30px 0;

background: $server-container-background-color;
box-shadow: 0 1px 2px 0 rgba($server-container-box-shadow-color,.15);

.servers-title {
line-height: 2em;
font-weight: bold;
}
.servers-title {
font-size: 12px;
font-weight: bold;
}

.operation-servers {
Expand Down