Skip to content

Commit

Permalink
Merge branch 'main' into faster-trashcan
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattmundell
mattmundell authored Feb 12, 2024
2 parents 5873a3e + c074336 commit f358c4c
Show file tree
Hide file tree
Showing 27 changed files with 2,452 additions and 2,385 deletions.
333 changes: 200 additions & 133 deletions package-lock.json
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"extends": "react-app"
},
"dependencies": {
"@babel/core": "7.23.5",
"@babel/runtime": "^7.23.5",
"@babel/core": "7.23.9",
"@babel/runtime": "^7.23.9",
"@greenbone/ui-components": "2021.1.2",
"@sentry/react": "^7.93.0",
"@vx/axis": "^0.0.199",
"@vx/gradient": "^0.0.199",
"@vx/shape": "^0.0.199",
"babel-loader": "9.1.3",
"core-js": "^3.35.0",
"core-js": "^3.35.1",
"d3-cloud": "^1.2.7",
"d3-color": "^3.1.0",
"d3-force": "^3.0.0",
Expand All @@ -45,12 +45,12 @@
"fast-xml-parser": "^4.2.5",
"history": "^4.10.1",
"hoist-non-react-statics": "^3.3.2",
"i18next": "^23.7.7",
"i18next": "^23.7.16",
"i18next-xhr-backend": "3.2.2",
"ical.js": "^1.5.0",
"memoize-one": "^6.0.0",
"moment": "^2.30.1",
"moment-timezone": "^0.5.43",
"moment-timezone": "^0.5.44",
"prop-types": "^15.8.1",
"qhistory": "^1.1.0",
"qs": "^6.11.2",
Expand All @@ -61,12 +61,12 @@
"react-redux": "^8.1.3",
"react-router-dom": "^5.2.0",
"react-scripts": "^5.0.1",
"redux": "^4.2.1",
"redux": "^5.0.1",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.4.2",
"redux-thunk": "^3.1.0",
"styled-components": "^6.1.1",
"uuid": "^9.0.1",
"whatwg-fetch": "^3.6.19"
"whatwg-fetch": "^3.6.20"
},
"scripts": {
"test": "react-scripts test --env=jest-environment-jsdom",
Expand All @@ -79,11 +79,11 @@
"clean-up-translations": "node scripts/cleanuptranslations"
},
"devDependencies": {
"@babel/cli": "^7.23.4",
"@babel/cli": "^7.23.9",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^29.5.10",
"@types/jest": "^29.5.11",
"babel-plugin-i18next-extract": "^0.10.0",
"eslint-config-prettier": "^9.1.0",
"husky": "^2.7.0",
Expand Down
96 changes: 48 additions & 48 deletions src/web/components/bar/__tests__/__snapshots__/titlebar.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,50 +118,50 @@ exports[`Titlebar tests should render content if user is logged in 1`] = `
display: inline-flex;
}
.c15 {
.c14 {
margin-left: -5px;
}
.c15>* {
.c14>* {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
display: inline-flex;
}
.c15>* {
.c14>* {
margin-left: 5px;
}
.c14 {
.c13 {
display: -webkit-inline-box;
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
display: inline-flex;
}
.c17 {
.c16 {
cursor: pointer;
}
.c9 {
.c8 {
height: 24px;
width: 24px;
line-height: 24px;
}
.c9 * {
.c8 * {
height: inherit;
width: inherit;
}
.c16 {
.c15 {
height: 16px;
width: 16px;
line-height: 16px;
}
.c16 * {
.c15 * {
height: inherit;
width: inherit;
}
Expand All @@ -176,18 +176,18 @@ exports[`Titlebar tests should render content if user is logged in 1`] = `
flex-direction: column;
}
.c11 {
.c10 {
position: relative;
display: none;
-webkit-animation: bNcXmX 0.1s ease-in;
animation: bNcXmX 0.1s ease-in;
}
.c6:hover .c11 {
.c6:hover .c10 {
display: block;
}
.c12 {
.c11 {
position: absolute;
margin: 0;
padding: 0;
Expand All @@ -199,7 +199,7 @@ exports[`Titlebar tests should render content if user is logged in 1`] = `
width: 300px;
}
.c13 {
.c12 {
height: 30px;
width: 300px;
border-left: 1px solid #7F7F7F;
Expand All @@ -216,48 +216,48 @@ exports[`Titlebar tests should render content if user is logged in 1`] = `
padding-left: 12px;
}
.c13:hover {
.c12:hover {
background: #11ab51;
color: #fff;
cursor: pointer;
}
.c13:first-child {
.c12:first-child {
border-top: 1px solid #7F7F7F;
cursor: default;
}
background-color:#f3f3f3 .c13:first-child:hover {
background-color:#f3f3f3 .c12:first-child:hover {
color: #000;
}
.c13:nth-child(2) {
.c12:nth-child(2) {
cursor: default;
}
background-color:#f3f3f3 .c13:nth-child(2):hover {
background-color:#f3f3f3 .c12:nth-child(2):hover {
color: #000;
}
.c13:last-child {
.c12:last-child {
border-top: 1px solid #7F7F7F;
border-bottom: 1px solid #7F7F7F;
}
.c10 {
.c9 {
margin-right: 10px;
}
.c18 {
.c17 {
width: 100%;
height: 100%;
}
.c18:link,
.c18:hover,
.c18:active,
.c18:visited,
.c18:hover {
.c17:link,
.c17:hover,
.c17:active,
.c17:visited,
.c17:hover {
color: inherit;
-webkit-text-decoration: none;
text-decoration: none;
Expand Down Expand Up @@ -304,7 +304,7 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
}
@media print {
.c8 {
.c16 {
display: none;
}
}
Expand Down Expand Up @@ -345,31 +345,31 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
data-testid="usermenu"
>
<span
class="c8 c9 c10"
class="c8 c9"
data-testid="svg-icon"
>
<svg>
user.svg
</svg>
</span>
<div
class="c11"
class="c10"
>
<ul
class="c12"
class="c11"
>
<li
class="c13"
class="c12"
title="Logged in as: username"
>
<div
class="c3 c14"
class="c3 c13"
>
<div
class="c3 c15"
class="c3 c14"
>
<span
class="c8 c16"
class="c15"
data-testid="svg-icon"
>
<svg>
Expand All @@ -383,16 +383,16 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
</div>
</li>
<li
class="c13"
class="c12"
>
<div
class="c3 c14"
class="c3 c13"
>
<div
class="c3 c15"
class="c3 c14"
>
<span
class="c8 c16"
class="c15"
data-testid="svg-icon"
>
<svg>
Expand All @@ -403,7 +403,7 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
Session timeout:
</span>
<span
class="c8 c17 c16"
class="c16 c15"
data-testid="svg-icon"
title="Renew session timeout"
>
Expand All @@ -417,21 +417,21 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
</div>
</li>
<li
class="c13"
class="c12"
>
<a
class="c2 c18"
class="c2 c17"
data-testid="usermenu-settings"
href="/usersettings"
>
<div
class="c3 c14"
class="c3 c13"
>
<div
class="c3 c15"
class="c3 c14"
>
<span
class="c8 c16"
class="c15"
data-testid="svg-icon"
>
<svg>
Expand All @@ -446,17 +446,17 @@ background-color:#f3f3f3 .c13:nth-child(2):hover {
</a>
</li>
<li
class="c13"
class="c12"
data-testid="usermenu-logout"
>
<div
class="c3 c14"
class="c3 c13"
>
<div
class="c3 c15"
class="c3 c14"
>
<span
class="c8 c16"
class="c15"
data-testid="svg-icon"
>
<svg>
Expand Down
8 changes: 4 additions & 4 deletions src/web/components/icon/__tests__/__snapshots__/svgicon.js.snap
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`SVG icon component tests should render icon 1`] = `
.c1 {
.c0 {
cursor: pointer;
}
.c2 {
.c1 {
height: 16px;
width: 16px;
line-height: 16px;
}
.c2 * {
.c1 * {
height: inherit;
width: inherit;
}
Expand All @@ -23,7 +23,7 @@ exports[`SVG icon component tests should render icon 1`] = `
}
<span
class="c0 c1 c2"
class="c0 c1"
data-testid="svg-icon"
title="Clone Entity"
>
Expand Down
Loading

0 comments on commit f358c4c

Please sign in to comment.