Skip to content

Commit

Permalink
Merge pull request #1286 from sarahd93/trashcan_gsa8
Browse files Browse the repository at this point in the history 
Add errordialog to fix missing error messages in trashcan
  • Loading branch information
@bjoernricks
bjoernricks authored Apr 16, 2019
2 parents 9089c68 + 06d2702 commit 5701013
Show file tree
Hide file tree
Showing 5 changed files with 544 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ $ cd gsa && git checkout gsa-8.0 && git log

## gsa 8.0.1 (unreleased)

* Add errordialog to fix missing error messages in trashcan #1286
* Display current result, comparable result and diff between results for delta
reports and their results in delta state "changed" #1284
* Fix New Target dialog contains value from Edit Target #1281
Expand Down
341 changes: 341 additions & 0 deletions gsa/src/web/components/dialog/__tests__/__snapshots__/errordialog.js.snap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,341 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`ErrorDialog component tests should render ErrorDialog with text and title 1`] = `
.c1 {
position: relative;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
margin: 10% auto;
border: 0;
outline: 0;
width: 400px;
height: autopx;
}
.c0 {
position: fixed;
font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
font-size: 1.1em;
top: 0;
right: 0;
bottom: 0;
left: 0;
margin: 0;
background: rgba(102,102,102,0.5);
z-index: 600;
-webkit-transition: opacity 1s ease-in;
transition: opacity 1s ease-in;
width: 100%;
height: 100%;
}
.c2 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
height: inherit;
padding: 0;
background: #fff;
box-shadow: 5px 5px 10px #787878;
border-radius: 3px;
border: 1px solid #787878;
}
.c4 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
.c8 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
-ms-flex-positive: 1;
flex-grow: 1;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
}
.c11 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
-webkit-box-pack: end;
-webkit-justify-content: flex-end;
-ms-flex-pack: end;
justify-content: flex-end;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
.c9 {
overflow: auto;
padding: 0 15px;
width: 100%;
height: 100%;
}
.c7 {
overflow: hidden;
height: 100%;
}
.c6 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
border: 1px solid #519032;
font-weight: bold;
font-size: 12px;
font-family: Verdana,sans-serif;
color: #519032;
cursor: pointer;
border-radius: 2px;
padding: 0;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
}
.c6:hover {
color: #fff;
background: #519032;
}
.c5 {
height: 24px;
width: 24px;
line-height: 24px;
}
.c5 * {
height: inherit;
width: inherit;
}
.c3 {
padding: 5px 5px 5px 10px;
margin-bottom: 15px;
border-radius: 2px 2px 0 0;
border-bottom: 1px solid #787878;
color: #fff;
font-weight: bold;
background: #66c430;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
cursor: -webkit-grab;
cursor: -moz-grab;
cursor: grab;
}
.c14 {
display: inline-block;
padding: 0 15px;
color: #393637;
text-align: center;
vertical-align: middle;
font-size: 11px;
font-weight: bold;
line-height: 30px;
-webkit-text-decoration: none;
text-decoration: none;
white-space: nowrap;
background-color: #fff;
border-radius: 2px;
border: 1px solid #aaaaaa;
cursor: pointer;
overflow: visible;
z-index: 1;
}
.c14:focus,
.c14:hover {
border: 1px solid #393637;
}
.c14:hover {
-webkit-text-decoration: none;
text-decoration: none;
background: #66c430;
font-weight: bold;
color: #fff;
}
.c14[disabled] {
cursor: not-allowed;
opacity: 0.65;
box-shadow: none;
}
.c14 img {
height: 32px;
width: 32px;
margin-top: 5px 10px 5px -10px;
vertical-align: middle;
}
.c14:link {
-webkit-text-decoration: none;
text-decoration: none;
color: #393637;
}
.c13 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
.c12 {
border: 1px solid #787878;
color: #519032;
background: #87d050;
}
.c12:hover {
color: #fff;
background: #519032;
}
.c10 {
border-width: 1px 0 0 0;
border-style: solid;
border-color: #c8d3d9;
margin-top: 15px;
padding: 10px 20px 10px 20px;
}
<body>
<div
id="portals"
>
<div>
<div
class="c0"
>
<div
class="c1"
height="autopx"
role="dialog"
tabindex="1"
width="400px"
>
<div
class="c2"
>
<div
class="c3 c4"
data-testid="dialog-title-bar"
>
<span>
bar
</span>
<div
class="c5 c6"
data-testid="dialog-title-close-button"
title="Close"
>
×
</div>
</div>
<div
class="c7 c8"
>
<div
class="c9"
data-testid="errordialog-content"
>
foo
</div>
</div>
<div
class="c10 c11"
>
<button
class="c12 c13 c14"
title="OK"
>
OK
</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div />
</body>
`;
Loading

0 comments on commit 5701013

Please sign in to comment.