Skip to content
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.

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

Ui improvements #955

Merged
merged 3 commits into from
Mar 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions local-dev/api-data/01-populate-api-data.gql
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,10 @@ mutation PopulateApi {
id
}

UIProject1Environment1addServices: setEnvironmentServices(input:{environment:3, services:["cli", "nginx", "mariadb"]}) {
id
}

UIProject1Environment2: addOrUpdateEnvironment(
input: {
id: 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const DrushRsyncFiles = ({
{(taskDrushRsyncFiles, { loading, called, error, data }) => {
return (
<React.Fragment>
<div className="warning">Warning! <br />This task replaces files. Be careful to double check the source and destination environment!</div>
<div className="envSelect">
<label id="source-env">Source:</label>
<ReactSelect
Expand Down Expand Up @@ -92,6 +93,12 @@ const DrushRsyncFiles = ({
Add task
</button>
<style jsx>{`
.warning {
background-color: red;
color: white;
padding: 10px;

}
.envSelect {
margin-top: 10px;
}
Expand Down
7 changes: 7 additions & 0 deletions services/ui/src/components/AddTask/components/DrushSqlSync.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const DrushSqlSync = ({
{(taskDrushSqlSync, { loading, called, error, data }) => {
return (
<React.Fragment>
<div className="warning">Warning! <br />This task overwrites databases. Be careful to double check the source and destination environment!</div>
<div className="envSelect">
<label id="source-env">Source:</label>
<ReactSelect
Expand Down Expand Up @@ -92,6 +93,12 @@ const DrushSqlSync = ({
Add task
</button>
<style jsx>{`
.warning {
background-color: red;
color: white;
padding: 10px;

}
.envSelect {
margin-top: 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion services/ui/src/components/AddTask/logic.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const withOptions = withProps(({ pageEnvironment }) => {
value: 'DrushSqlDump'
},
{
label: 'Drush archive-dump (D7 only)',
label: 'Drush archive-dump (Drush 8 only)',
value: 'DrushArchiveDump'
}
];
Expand Down
8 changes: 8 additions & 0 deletions services/ui/src/pages/backups.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ const PageBackups = withRouter((props) => {
<div className='content-wrapper'>
<NavTabs activeTab='backups' environment={environment.openshiftProjectName}/>
<div className="content">
<div className="notification">
If you need a current database or files dump, use the tasks "drush sql-dump" or "drush archive-dump" in the new "Tasks" section!
</div>
<div className="header">
<label className="source">Source</label>
<label className="created">Created</label>
Expand Down Expand Up @@ -179,6 +182,11 @@ const PageBackups = withRouter((props) => {
.content {
padding: 32px calc((100vw / 16) * 1);
width: 100%;
.notification {
background-color: ${color.lightBlue};
color: ${color.white};
padding: 10px 20px;
}
.header {
@media ${bp.wideUp} {
align-items: center;
Expand Down