merge #2700, #2703 and #2705 from master to jetty 1.12.x branch (#2713)

* merge #2700, #2703 and #2705 from master to jetty 1.12.x branch --------- Signed-off-by: Henry Avetisyan <[email protected]>
AthenZ · Sep 5, 2024 · 3f3221f · 3f3221f
1 parent 3acc0ea
commit 3f3221f
Show file tree

Hide file tree

Showing 15 changed files with 485 additions and 266 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -57,7 +57,8 @@
         "@redux-devtools/extension": "3.2.3",
         "@reduxjs/toolkit": "1.8.5",
         "async": "3.2.4",
-        "aws-sdk": "^2.1213.0",
+        "aws-sdk": "2.1680.0",
+        "axios": "1.6.0",
         "body-parser": "1.20.0",
         "cookie-parser": "1.4.6",
         "cookie-session": "2.0.0",
@@ -73,7 +74,7 @@
         "flatpickr": "4.6.13",
         "helmet": "6.0.0",
         "immer": "9.0.15",
-        "jest-when": "^3.6.0",
+        "jest-when": "3.6.0",
         "js-cookie": "3.0.1",
         "lodash": "4.17.21",
         "lodash.clone": "4.5.0",
@@ -97,7 +98,6 @@
         "redux-devtools-extension": "2.13.9",
         "redux-mock-store": "1.5.4",
         "redux-thunk": "2.4.1",
-        "axios": "1.6.0",
         "setimmediate": "1.0.5",
         "terser": "5.15.0",
         "tslib": "2.4.0",
@@ -112,14 +112,15 @@
         "@sinonjs/referee": "9.1.1",
         "@testing-library/jest-dom": "6.4.2",
         "@testing-library/react": "13.4.0",
-        "@types/jest": "^29.5.12",
+        "@types/jest": "29.5.12",
         "@wdio/cli": "8.31.0",
         "@wdio/local-runner": "8.31.0",
         "@wdio/mocha-framework": "8.31.0",
         "@wdio/sauce-service": "8.31.0",
         "@wdio/spec-reporter": "8.31.0",
         "babel-jest": "29.7.0",
-        "chromedriver": "^120",
+        "babel-preset-current-node-syntax": "1.0.1",
+        "chromedriver": "120",
         "dotenv": "16.0.2",
         "expect": "29.0.3",
         "expect-webdriverio": "4.11.2",

diff --git a/ui/src/__tests__/components/denali/__snapshots__/Input.test.js.snap b/ui/src/__tests__/components/denali/__snapshots__/Input.test.js.snap
@@ -1107,58 +1107,58 @@ exports[`Input should render an input with error 1`] = `
   color: #d01111;
 }
 
-.css-1ibtbft-default-default-normal-default-input-subtitle-makeInputBaseClass.error input,
-.css-1ibtbft-default-default-normal-default-input-subtitle-makeInputBaseClass.error input.focused,
-.css-1ibtbft-default-default-normal-default-input-subtitle-makeInputBaseClass.error input:active,
-.css-1ibtbft-default-default-normal-default-input-subtitle-makeInputBaseClass.error input:focus {
+.css-17w65qf-default-default-normal-default-input-subtitle-makeInputBaseClass.error input,
+.css-17w65qf-default-default-normal-default-input-subtitle-makeInputBaseClass.error input.focused,
+.css-17w65qf-default-default-normal-default-input-subtitle-makeInputBaseClass.error input:active,
+.css-17w65qf-default-default-normal-default-input-subtitle-makeInputBaseClass.error input:focus {
   border-bottom: 2px solid #d01111;
 }
 
-.css-1ibtbft-default-default-normal-default-input-subtitle-makeInputBaseClass.error .message {
+.css-17w65qf-default-default-normal-default-input-subtitle-makeInputBaseClass.error .message {
   color: #d01111;
 }
 
-.css-7pw43o-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error input,
-.css-7pw43o-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error input.focused,
-.css-7pw43o-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error input:active,
-.css-7pw43o-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error input:focus {
+.css-zv347j-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error input,
+.css-zv347j-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error input.focused,
+.css-zv347j-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error input:active,
+.css-zv347j-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error input:focus {
   border-bottom: 2px solid #d01111;
 }
 
-.css-7pw43o-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error .message {
+.css-zv347j-default-default-normal-default-input-subtitle-makeInputBaseClass-disabledCss-Input.error .message {
   color: #d01111;
 }
 
-.css-75nwcf-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error input,
-.css-75nwcf-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error input.focused,
-.css-75nwcf-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error input:active,
-.css-75nwcf-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error input:focus {
+.css-qk5url-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error input,
+.css-qk5url-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error input.focused,
+.css-qk5url-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error input:active,
+.css-qk5url-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error input:focus {
   border-bottom: 2px solid #d01111;
 }
 
-.css-75nwcf-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error .message {
+.css-qk5url-default-default-normal-default-input-subtitle-makeInputBaseClass-darkCss-Input.error .message {
   color: #d01111;
 }
 
-.css-j9fivm-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error input,
-.css-j9fivm-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error input.focused,
-.css-j9fivm-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error input:active,
-.css-j9fivm-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error input:focus {
+.css-1pkkru2-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error input,
+.css-1pkkru2-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error input.focused,
+.css-1pkkru2-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error input:active,
+.css-1pkkru2-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error input:focus {
   border-bottom: 2px solid #d01111;
 }
 
-.css-j9fivm-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error .message {
+.css-1pkkru2-default-default-normal-default-input-subtitle-makeInputBaseClass-darkDisabledCss-Input.error .message {
   color: #d01111;
 }
 
-.css-1cov534-default-default-normal-default-input-subtitle-makeInputBaseClass.error input,
-.css-1cov534-default-default-normal-default-input-subtitle-makeInputBaseClass.error input.focused,
-.css-1cov534-default-default-normal-default-input-subtitle-makeInputBaseClass.error input:active,
-.css-1cov534-default-default-normal-default-input-subtitle-makeInputBaseClass.error input:focus {
+.css-5jacvs-default-default-normal-default-input-subtitle-makeInputBaseClass.error input,
+.css-5jacvs-default-default-normal-default-input-subtitle-makeInputBaseClass.error input.focused,
+.css-5jacvs-default-default-normal-default-input-subtitle-makeInputBaseClass.error input:active,
+.css-5jacvs-default-default-normal-default-input-subtitle-makeInputBaseClass.error input:focus {
   border-bottom: 2px solid #d01111;
 }
 
-.css-1cov534-default-default-normal-default-input-subtitle-makeInputBaseClass.error .message {
+.css-5jacvs-default-default-normal-default-input-subtitle-makeInputBaseClass.error .message {
   color: #d01111;
 }
 

diff --git a/ui/src/__tests__/components/group/__snapshots__/GroupRow.test.js.snap b/ui/src/__tests__/components/group/__snapshots__/GroupRow.test.js.snap
@@ -23,7 +23,7 @@ exports[`GroupRow should render 1`] = `
   padding-left: 20px;
 }
 
-.emotion-6 {
+.emotion-10 {
   background-color: #3570f40D;
   text-align: center;
   padding: 5px 0 5px 15px;
@@ -52,19 +52,19 @@ exports[`GroupRow should render 1`] = `
     </span>
   </td>
   <td
-    class="emotion-6 emotion-3"
+    class="emotion-2 emotion-3"
     color="#3570f40D"
   >
     2017-08-03 18:44 UTC
   </td>
   <td
-    class="emotion-6 emotion-3"
+    class="emotion-2 emotion-3"
     color="#3570f40D"
   >
     N/A
   </td>
   <td
-    class="emotion-6 emotion-3"
+    class="emotion-10 emotion-3"
     color="#3570f40D"
   >
     <span>
@@ -92,7 +92,7 @@ exports[`GroupRow should render 1`] = `
     </span>
   </td>
   <td
-    class="emotion-6 emotion-3"
+    class="emotion-10 emotion-3"
     color="#3570f40D"
   >
     <span>
@@ -114,7 +114,32 @@ exports[`GroupRow should render 1`] = `
     </span>
   </td>
   <td
-    class="emotion-6 emotion-3"
+    class="emotion-10 emotion-3"
+    color="#3570f40D"
+  >
+    <span>
+      <svg
+        class="emotion-12"
+        data-testid="icon"
+        height="1.25em"
+        id=""
+        viewBox="0 0 1024 1024"
+        width="1.25em"
+      >
+        <path
+          d="M512 640c23.564 0 42.667-19.103 42.667-42.667v0-256c0-23.564-19.103-42.667-42.667-42.667s-42.667 19.103-42.667 42.667v0 256c0 23.564 19.103 42.667 42.667 42.667v0z"
+        />
+        <path
+          d="M554.667 768c0 23.564-19.103 42.667-42.667 42.667s-42.667-19.103-42.667-42.667c0-23.564 19.103-42.667 42.667-42.667s42.667 19.103 42.667 42.667z"
+        />
+        <path
+          d="M853.333 128h-85.333v-42.667c0-23.564-19.103-42.667-42.667-42.667v0h-426.667c-23.564 0-42.667 19.103-42.667 42.667v0 42.667h-85.333c-23.564 0-42.667 19.103-42.667 42.667v0 768c0 23.564 19.103 42.667 42.667 42.667v0h682.667c23.564 0 42.667-19.103 42.667-42.667v0-768c0-23.564-19.103-42.667-42.667-42.667v0zM810.667 896h-597.333v-682.667h128v-85.333h341.333v85.333h128z"
+        />
+      </svg>
+    </span>
+  </td>
+  <td
+    class="emotion-10 emotion-3"
     color="#3570f40D"
   >
     <span>
@@ -139,7 +164,7 @@ exports[`GroupRow should render 1`] = `
     </span>
   </td>
   <td
-    class="emotion-6 emotion-3"
+    class="emotion-10 emotion-3"
     color="#3570f40D"
   >
     <span>
@@ -164,7 +189,7 @@ exports[`GroupRow should render 1`] = `
     </span>
   </td>
   <td
-    class="emotion-6 emotion-3"
+    class="emotion-10 emotion-3"
     color="#3570f40D"
   >
     <span>
@@ -189,7 +214,7 @@ exports[`GroupRow should render 1`] = `
     </span>
   </td>
   <td
-    class="emotion-6 emotion-3"
+    class="emotion-10 emotion-3"
     color="#3570f40D"
   >
     <span>